ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Oct 23 23:32:32 2014 +0200| [20aac40571a51aa5c32dc15958a73a23158986e2] | committer: Michael Niedermayer
Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Print an error if -r and -vsync 0 are used together. Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20aac40571a51aa5c32dc15958a73a23158986e2 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
