[SCM] libav/experimental: Implement poll_frame() method. Fix ffmpeg.c bug with vf_fps filter.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7b02c484eb4e5b1b10fa060c42932e303d58e392
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Fri Feb 15 21:40:26 2008 +0000

    Implement poll_frame() method. Fix ffmpeg.c bug with
    vf_fps filter.
    
    Commited in SoC by Vitor Sessak on 2008-02-06 19:55:36
    
    Originally committed as revision 12039 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 08e6aae..f2a42cb 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -185,6 +185,22 @@ int avfilter_request_frame(AVFilterLink *link)
     else return -1;
 }
 
+int avfilter_poll_frame(AVFilterLink *link)
+{
+    int i, min=INT_MAX;
+
+    if(link_spad(link).poll_frame)
+        return link_spad(link).poll_frame(link);
+    else
+        for (i=0; i<link->src->input_count; i++) {
+            if(!link->src->inputs[i])
+                return -1;
+            min = FFMIN(min, avfilter_poll_frame(link->src->inputs[i]));
+        }
+
+    return min;
+}
+
 /* XXX: should we do the duplicating of the picture ref here, instead of
  * forcing the source filter to do it? */
 void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)

-- 
Libav/FFmpeg packaging