[FFmpeg-cvslog] Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 16:53:09 2013 +0100| [f7c4b76c488b4901133addb3f7875ef3ac4ae9c4] | committer: Michael Niedermayer

Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'

* commit 'd7c450436fcb9d3ecf59884a574e7684183e753d':
  ac3dec: validate channel output mode against channel count

Conflicts:
	libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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