[SCM] libav/experimental: Fix behavior when exporting output pad with default query_formats()
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 7b712850d2addea6e2b584bb223ffe74c08577bd
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Fri Apr 4 20:06:28 2008 +0000
Fix behavior when exporting output pad with default query_formats()
Commited in SoC by Bobby Bingham on 2007-08-08 04:25:08
Originally committed as revision 12697 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index c01e812..dae2c97 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -257,8 +257,10 @@ static int *graph_out_query_formats(AVFilterLink *link)
{
AVFilterLink *link2 = get_intern_output_link(link);
- if(!link2 || !link2->src->output_pads[link2->srcpad].query_formats)
+ if(!link2)
return avfilter_make_format_list(0);
+ if(!link2->src->output_pads[link2->srcpad].query_formats)
+ return avfilter_default_query_output_formats(link2);
return link2->src->output_pads[link2->srcpad].query_formats(link2);
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list