[FFmpeg-cvslog] lavfi/video: ensure that filter_frame is called.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Thu Dec 27 00:42:51 2012 +0100| [a978c04e228e48d5828da5197a4b8eeef9c4ecb8] | committer: Nicolas George

lavfi/video: ensure that filter_frame is called.

This is a temporary workaround until all filters have been
upgraded to filter_frame and the framework can forget completely
about start_frame/draw_slice/end_frame.

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

 libavfilter/video.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavfilter/video.c b/libavfilter/video.c
index a7ef045..bd2d32a 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -163,6 +163,9 @@ static int default_start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
 {
     AVFilterLink *outlink = NULL;
 
+    if (inlink->dstpad->filter_frame)
+        return 0;
+
     if (inlink->dst->nb_outputs)
         outlink = inlink->dst->outputs[0];
 
@@ -275,6 +278,12 @@ static int default_end_frame(AVFilterLink *inlink)
 {
     AVFilterLink *outlink = NULL;
 
+    if (inlink->dstpad->filter_frame) {
+        int ret = inlink->dstpad->filter_frame(inlink, inlink->cur_buf);
+        inlink->cur_buf = NULL;
+        return ret;
+    }
+
     if (inlink->dst->nb_outputs)
         outlink = inlink->dst->outputs[0];