aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-05 22:27:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-05 22:27:34 +0100
commitbc7f76377c1e8850af163646a98ab086a84f5d66 (patch)
treee9601aa8be8325fc6fed43a0e479bdb3621f4aaa /doc
parent4cf4da9dc5814aebe8881d93b4a88f593b774448 (diff)
parent6bfdb2de881372048be7fbda643417e1fd3ce93c (diff)
downloadffmpeg-bc7f76377c1e8850af163646a98ab086a84f5d66.tar.gz
Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'
* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c': dcadec: set the output channel mode more accurately. Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions