From 06e7301a2efa8dededecbe6836ee5b59bf7e5e76 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 1 Oct 2013 19:08:03 +0200 Subject: vf_interlace: do not process an already interlaced frame Signed-off-by: Anton Khirnov --- libavfilter/vf_interlace.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'libavfilter/vf_interlace.c') diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index d65473967f..139d5b0247 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -181,6 +181,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) if (!s->cur || !s->next) return 0; + if (s->cur->interlaced_frame) { + av_log(ctx, AV_LOG_WARNING, + "video is already interlaced, adjusting framerate only\n"); + out = av_frame_clone(s->cur); + out->pts /= 2; // adjust pts to new framerate + ret = ff_filter_frame(outlink, out); + s->got_output = 1; + return ret; + } + tff = (s->scan == MODE_TFF); out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) -- cgit v1.2.3