[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Mar 17 18:45:54 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 16:28:07 2014 +0100| [b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: check color_range
Conflicts:
libavcodec/libx264.c
See: 48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99
---
More information about the ffmpeg-cvslog
mailing list