diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-01-28 19:48:17 +0100 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-01-28 22:01:09 +0100 |
commit | 836110665f181465f4d44b57ca86599677fd12b9 (patch) | |
tree | 7d2798d3fb2be7a28079246e95f28325d98641b2 | |
parent | 34751f8313a41bf94e004ffa9491f35d96763558 (diff) | |
download | ffmpeg-streaming-836110665f181465f4d44b57ca86599677fd12b9.zip ffmpeg-streaming-836110665f181465f4d44b57ca86599677fd12b9.tar.gz |
Compare video_sync_method against the appropriate defines.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2600,8 +2600,8 @@ static int transcode_init(OutputFile *output_files, int nb_output_files, ost->frame_rate = ost->enc->supported_framerates[idx]; } codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num}; - if ( av_q2d(codec->time_base) < 0.001 && video_sync_method - && (video_sync_method==1 || (video_sync_method<0 && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){ + if ( av_q2d(codec->time_base) < 0.001 && video_sync_method != VSYNC_PASSTHROUGH + && (video_sync_method == VSYNC_CFR || (video_sync_method == VSYNC_AUTO && !(oc->oformat->flags & AVFMT_VARIABLE_FPS)))){ av_log(oc, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n" "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n"); } |