[FFmpeg-cvslog] Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2
Michael Niedermayer
git at videolan.org
Sun May 11 16:40:30 CEST 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 11 16:23:29 2014 +0200| [ed1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec] | committer: Michael Niedermayer
Merge commit 'b3d8276d2dc913d708d187fb15f6e98869d00500' into release/2.2
* commit 'b3d8276d2dc913d708d187fb15f6e98869d00500':
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=ed1ad2f5ebe9ad4ee8700760e97d30ca5b75d9ec
---
More information about the ffmpeg-cvslog
mailing list