diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-05-21 14:52:34 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-05-21 16:09:42 +0200 |
| commit | b8a9876a8b204d922bde6d2fbdc72670800bdd42 (patch) | |
| tree | 322193e820b0729b31bb865982211daa43f8cbed | |
| parent | b1bbd715d8c42f4236f3bceac061f81da2c31a35 (diff) | |
| download | ffmpeg-b8a9876a8b204d922bde6d2fbdc72670800bdd42.tar.gz | |
lavfi/yadif: add timeline support.
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_yadif.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 22d45892ab..f238a9656b 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 68 -#define LIBAVFILTER_VERSION_MICRO 101 +#define LIBAVFILTER_VERSION_MICRO 102 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index cc7c3e2114..0a435c2690 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -280,7 +280,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *frame) if (!yadif->cur) return 0; - if (yadif->deint && !yadif->cur->interlaced_frame) { + if ((yadif->deint && !yadif->cur->interlaced_frame) || ctx->is_disabled) { yadif->out = av_frame_clone(yadif->cur); if (!yadif->out) return AVERROR(ENOMEM); @@ -484,4 +484,5 @@ AVFilter avfilter_vf_yadif = { .inputs = avfilter_vf_yadif_inputs, .outputs = avfilter_vf_yadif_outputs, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, }; |