Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:42:56 +0000 (13:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:42:56 +0000 (13:42 +0100)
commitd5518545d1b6df40d71e43dab8ada97710273db3
treec23ddf81c2acfd057daca41582ee1404a1695c67
parent60a0bc46cdba5f13d557624d3448628328ad0fb0
parentca1fe6c0e60808da45d4dfd8728f45e843b9f9b0
Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'

* commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0':
  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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/ituh263dec.c
libavcodec/rv10.c
libavcodec/version.h