summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 16:53:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 16:53:09 +0100
commitf7c4b76c488b4901133addb3f7875ef3ac4ae9c4 (patch)
tree41ceaad1043b8b1cc5412504bd43dbd540dc546d /doc
parentdbabea2f23782c09106765a6791a38f6e52fc7fd (diff)
parentd7c450436fcb9d3ecf59884a574e7684183e753d (diff)
downloadffmpeg-streaming-f7c4b76c488b4901133addb3f7875ef3ac4ae9c4.zip
ffmpeg-streaming-f7c4b76c488b4901133addb3f7875ef3ac4ae9c4.tar.gz
Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'
* commit 'd7c450436fcb9d3ecf59884a574e7684183e753d': ac3dec: validate channel output mode against channel count Conflicts: libavcodec/ac3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud