[FFmpeg-cvslog] Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'
Michael Niedermayer
git at videolan.org
Sun Apr 13 04:50:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 04:23:56 2014 +0200| [a676e48d394cf9972730859d62f537dfe0a9dce2] | committer: Michael Niedermayer
Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'
* commit '801c39e1e3058fc4ba822bfb5d8612d777111e32':
dcadec: Use correct channel count in stereo downmix check
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a676e48d394cf9972730859d62f537dfe0a9dce2
---
More information about the ffmpeg-cvslog
mailing list