[FFmpeg-cvslog] lavfi/yadif: add timeline support.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Tue May 21 14:52:34 2013 +0200| [b8a9876a8b204d922bde6d2fbdc72670800bdd42] | committer: Clément Bœsch

lavfi/yadif: add timeline support.

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

 libavfilter/version.h  |    2 +-
 libavfilter/vf_yadif.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavfilter/version.h b/libavfilter/version.h
index 22d4589..f238a96 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 cc7c3e2..0a435c2 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,
 };