[FFmpeg-cvslog] ffmpeg: replace magic number with VSYNC_CFR

Peter Ross git at videolan.org
Sun Dec 16 00:04:46 CET 2012


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Dec 14 23:31:41 2012 +1100| [c16f768d73cc9bd8fa2cc146dd139b1de5b4d97b] | committer: Peter Ross

ffmpeg: replace magic number with VSYNC_CFR

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c16f768d73cc9bd8fa2cc146dd139b1de5b4d97b
---

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 956f5b6..36e9c2b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -803,7 +803,7 @@ static void do_video_out(AVFormatContext *s,
 
     format_video_sync = video_sync_method;
     if (format_video_sync == VSYNC_AUTO)
-        format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : 1;
+        format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : VSYNC_CFR;
 
     switch (format_video_sync) {
     case VSYNC_CFR:



More information about the ffmpeg-cvslog mailing list