ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Tue Dec 2 14:46:30 2014 +0100| [5111c78eab4d10e75a842982a181ded27425bdb8] | committer: Michael Niedermayer
Merge commit 'd1c2f86b21b96c27fac200209f52c98dcb2b3194' into release/2.2 * commit 'd1c2f86b21b96c27fac200209f52c98dcb2b3194': Replace lena.pnm Conflicts: tests/Makefile tests/ref/seek/vsynth2-ffv1 tests/ref/seek/vsynth2-flv tests/ref/seek/vsynth2-h261 tests/ref/seek/vsynth2-h263 tests/ref/seek/vsynth2-h263p tests/ref/seek/vsynth2-ljpeg tests/ref/seek/vsynth2-mjpeg tests/ref/seek/vsynth2-mpeg1 tests/ref/seek/vsynth2-mpeg1b tests/ref/seek/vsynth2-mpeg2-422 tests/ref/seek/vsynth2-mpeg2-idct-int tests/ref/seek/vsynth2-mpeg2-ilace tests/ref/seek/vsynth2-mpeg2-ivlc-qprd tests/ref/seek/vsynth2-mpeg2-thread tests/ref/seek/vsynth2-mpeg2-thread-ivlc tests/ref/seek/vsynth2-mpeg4 tests/ref/seek/vsynth2-mpeg4-adap tests/ref/seek/vsynth2-mpeg4-error tests/ref/seek/vsynth2-mpeg4-nr tests/ref/seek/vsynth2-mpeg4-qpel tests/ref/seek/vsynth2-mpeg4-qprd tests/ref/seek/vsynth2-mpeg4-rc tests/ref/seek/vsynth2-mpeg4-thread tests/ref/seek/vsynth2-msmpeg4 tests/ref/seek/vsynth2-msmpeg4v2 tests/ref/seek/vsynth2-rv10 tests/ref/seek/vsynth2-rv20 tests/ref/seek/vsynth2-svq1 tests/ref/seek/vsynth2-wmv1 tests/ref/seek/vsynth2-wmv2 tests/ref/vsynth/vsynth2-cljr tests/ref/vsynth/vsynth2-dnxhd-1080i tests/ref/vsynth/vsynth2-dnxhd-720p tests/ref/vsynth/vsynth2-dnxhd-720p-10bit tests/ref/vsynth/vsynth2-dnxhd-720p-rd tests/ref/vsynth/vsynth2-dv tests/ref/vsynth/vsynth2-dv-411 tests/ref/vsynth/vsynth2-dv-50 tests/ref/vsynth/vsynth2-ffv1 tests/ref/vsynth/vsynth2-ffvhuff tests/ref/vsynth/vsynth2-flashsv tests/ref/vsynth/vsynth2-flv tests/ref/vsynth/vsynth2-h261 tests/ref/vsynth/vsynth2-h263 tests/ref/vsynth/vsynth2-h263-obmc tests/ref/vsynth/vsynth2-h263p tests/ref/vsynth/vsynth2-huffyuv tests/ref/vsynth/vsynth2-jpegls tests/ref/vsynth/vsynth2-ljpeg tests/ref/vsynth/vsynth2-mjpeg tests/ref/vsynth/vsynth2-mpeg1 tests/ref/vsynth/vsynth2-mpeg1b tests/ref/vsynth/vsynth2-mpeg2 tests/ref/vsynth/vsynth2-mpeg2-422 tests/ref/vsynth/vsynth2-mpeg2-ilace tests/ref/vsynth/vsynth2-mpeg2-thread tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc tests/ref/vsynth/vsynth2-mpeg4 tests/ref/vsynth/vsynth2-mpeg4-adap tests/ref/vsynth/vsynth2-mpeg4-error tests/ref/vsynth/vsynth2-mpeg4-nr tests/ref/vsynth/vsynth2-mpeg4-qpel tests/ref/vsynth/vsynth2-mpeg4-qprd tests/ref/vsynth/vsynth2-mpeg4-rc tests/ref/vsynth/vsynth2-mpeg4-thread tests/ref/vsynth/vsynth2-msmpeg4 tests/ref/vsynth/vsynth2-msmpeg4v2 tests/ref/vsynth/vsynth2-prores tests/ref/vsynth/vsynth2-qtrle tests/ref/vsynth/vsynth2-rgb tests/ref/vsynth/vsynth2-rv10 tests/ref/vsynth/vsynth2-rv20 tests/ref/vsynth/vsynth2-svq1 tests/ref/vsynth/vsynth2-wmv1 tests/ref/vsynth/vsynth2-wmv2 tests/ref/vsynth/vsynth2-yuv See: c4abee734dcbdb589925dd6da98041dcf663ce49 Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5111c78eab4d10e75a842982a181ded27425bdb8 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog