[SCM] libav/experimental: Let request_frame() indicate success or failure
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:18:17 UTC 2013
The following commit has been merged in the experimental branch:
commit 1d2067e2c7033a95a6160ff25e3455cb2c30c35f
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Fri Apr 4 20:06:34 2008 +0000
Let request_frame() indicate success or failure
Commited in SoC by Bobby Bingham on 2007-08-11 17:42:36
Originally committed as revision 12699 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index abd41aa..baac83c 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -70,13 +70,13 @@ static int *link_in_query_formats(AVFilterLink *link)
}
/** request a frame from a filter providing input to the graph */
-static void link_in_request_frame(AVFilterLink *link)
+static int link_in_request_frame(AVFilterLink *link)
{
AVFilterLink *link2 = get_extern_input_link(link);
if(!link2)
- return;
- avfilter_request_frame(link2);
+ return -1;
+ return avfilter_request_frame(link2);
}
static int link_in_config_props(AVFilterLink *link)
@@ -265,12 +265,13 @@ static int *graph_out_query_formats(AVFilterLink *link)
return link2->src->output_pads[link2->srcpad].query_formats(link2);
}
-static void graph_out_request_frame(AVFilterLink *link)
+static int graph_out_request_frame(AVFilterLink *link)
{
AVFilterLink *link2 = get_intern_output_link(link);
if(link2)
- avfilter_request_frame(link2);
+ return avfilter_request_frame(link2);
+ return -1;
}
static int graph_out_config_props(AVFilterLink *link)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list