[FFmpeg-cvslog] Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'
Michael Niedermayer
git at videolan.org
Sun Apr 13 04:13:34 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 04:07:27 2014 +0200| [952614b8996e33fe406ef91f537e5776cd55111c] | committer: Michael Niedermayer
Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'
* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560':
dcadec: Do not decode the XCh extension when downmixing to stereo
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=952614b8996e33fe406ef91f537e5776cd55111c
---
More information about the ffmpeg-cvslog
mailing list