Skip to content
Snippets Groups Projects
Commit d5518545 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'ca1fe6c0' 


* commit 'ca1fe6c0':
  h263: remove an unused parameter from ff_h263_decode_init_vlc
  flac: add channel layout masks for streams with 7 or 8 channels.
  flac: don't check the number of channels before setting the channel layout.

Conflicts:
	libavcodec/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 60a0bc46 ca1fe6c0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment