[FFmpeg-cvslog] Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
Michael Niedermayer
git at videolan.org
Sun Feb 24 14:09:58 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 14:05:16 2013 +0100| [a77a27a24b27fc29d119b00866740e4d0b69ba28] | committer: Michael Niedermayer
Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
libx264: change i_qfactor to use x264cli's default
qtrle: use AV_LOG_ERROR in an error message.
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a77a27a24b27fc29d119b00866740e4d0b69ba28
---
More information about the ffmpeg-cvslog
mailing list