Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 15:53:09 +0000 (16:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 15:53:09 +0000 (16:53 +0100)
* commit 'd7c450436fcb9d3ecf59884a574e7684183e753d':
  ac3dec: validate channel output mode against channel count

Conflicts:
libavcodec/ac3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ac3dec.c

Simple merge