[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:14:27 UTC 2013
The following commit has been merged in the experimental branch:
commit 3306f8bd15301d84c11f85f0fa3b1e627663f1ac
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Fri Feb 15 21:37:31 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 12001 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index b004d11..2793ac9 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -144,14 +144,15 @@ AVFilterPicRef *avfilter_get_video_buffer(AVFilterLink *link, int perms)
return ret;
}
-void avfilter_request_frame(AVFilterLink *link)
+int avfilter_request_frame(AVFilterLink *link)
{
const AVFilterPad *pad = &link->src->output_pads[link->srcpad];
if(pad->request_frame)
- pad->request_frame(link);
+ return pad->request_frame(link);
else if(link->src->inputs[0])
- avfilter_request_frame(link->src->inputs[0]);
+ return avfilter_request_frame(link->src->inputs[0]);
+ else return -1;
}
/* XXX: should we do the duplicating of the picture ref here, instead of
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list