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)
commitf7c4b76c488b4901133addb3f7875ef3ac4ae9c4
tree41ceaad1043b8b1cc5412504bd43dbd540dc546d
parentdbabea2f23782c09106765a6791a38f6e52fc7fd
parentd7c450436fcb9d3ecf59884a574e7684183e753d
Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'

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

Conflicts:
libavcodec/ac3dec.c

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