]> git.sesse.net Git - ffmpeg/commit
avfilter/formats: allow unknown channel layouts by default
authorMarton Balint <cus@passwd.hu>
Mon, 21 Nov 2016 23:40:50 +0000 (00:40 +0100)
committerMarton Balint <cus@passwd.hu>
Sat, 10 Dec 2016 10:57:11 +0000 (11:57 +0100)
commit7ceb9e6b11824ff18f424a35e41fbddf545d1238
tree0828194676314e53ed5d1a5981881019b079ff7c
parent5b73ba9887d419ee056723248c7a3dd51f05c3e7
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 <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
libavfilter/af_anull.c
libavfilter/af_asyncts.c
libavfilter/f_loop.c
libavfilter/f_metadata.c
libavfilter/f_sidedata.c
libavfilter/formats.c
libavfilter/formats.h
libavfilter/split.c
libavfilter/trim.c