[FFmpeg-cvslog] Merge commit 'ca1fe6c0e60808da45d4dfd8728f45e843b9f9b0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb  7 13:42:56 2013 +0100| [d5518545d1b6df40d71e43dab8ada97710273db3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5518545d1b6df40d71e43dab8ada97710273db3
---