[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Fri Nov 29 05:02:41 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 04:39:52 2013 +0100| [5b3c68414749e87ef46a7ce19ce75be8c6f3d515] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadec: add disable_xch private option.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b3c68414749e87ef46a7ce19ce75be8c6f3d515
---
More information about the ffmpeg-cvslog
mailing list