From 7ceb9e6b11824ff18f424a35e41fbddf545d1238 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Tue, 22 Nov 2016 00:40:50 +0100 Subject: avfilter/formats: allow unknown channel layouts by default Since the default in the libav fork is to only allow known layouts, making unknown layouts allowed by default here can be a security risk for filters directly merged from libav. However, usually it is simple to detect such cases, use of av_get_channel_layout_nb_channels is a good indicator, so I suggest we change this regardless. See http://ffmpeg.org/pipermail/ffmpeg-devel/2016-November/203204.html. This patch indirectly adds unknown channel layout support for filters where query_formats is not specified: abench afifo ainterleave anullsink apad aperms arealtime aselect asendcmd asetnsamples asetpts asettb ashowinfo azmq It introduces a query_formats callback for the asyncts filter, which only supports known channel layouts since it is using libavresample. And it removes .query_formats callback from filters where it was only there to support unknown layouts, as this is now the default: aloop ametadata anull asidedata asplit atrim Acked-by: Nicolas George Signed-off-by: Marton Balint --- libavfilter/f_metadata.c | 1 - 1 file changed, 1 deletion(-) (limited to 'libavfilter/f_metadata.c') diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c index 24deccfb2c..1f613ecb56 100644 --- a/libavfilter/f_metadata.c +++ b/libavfilter/f_metadata.c @@ -373,7 +373,6 @@ AVFilter ff_af_ametadata = { .priv_class = &ametadata_class, .init = init, .uninit = uninit, - .query_formats = ff_query_formats_all, .inputs = ainputs, .outputs = aoutputs, .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, -- cgit v1.2.3