diff options
| author | Marton Balint <cus@passwd.hu> | 2016-11-22 00:40:50 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2016-12-10 11:57:11 +0100 |
| commit | 7ceb9e6b11824ff18f424a35e41fbddf545d1238 (patch) | |
| tree | 0828194676314e53ed5d1a5981881019b079ff7c /libavfilter/formats.h | |
| parent | 5b73ba9887d419ee056723248c7a3dd51f05c3e7 (diff) | |
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>
Diffstat (limited to 'libavfilter/formats.h')
| -rw-r--r-- | libavfilter/formats.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavfilter/formats.h b/libavfilter/formats.h index 77981f5b36..870809b5a0 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -186,15 +186,13 @@ void ff_channel_layouts_changeref(AVFilterChannelLayouts **oldref, av_warn_unused_result int ff_default_query_formats(AVFilterContext *ctx); -/** - * Set the formats list to all existing formats. - * This function behaves like ff_default_query_formats(), except it also - * accepts channel layouts with unknown disposition. It should only be used - * with audio filters. + /** + * Set the formats list to all known channel layouts. This function behaves + * like ff_default_query_formats(), except it only accepts known channel + * layouts. It should only be used with audio filters. */ av_warn_unused_result -int ff_query_formats_all(AVFilterContext *ctx); - +int ff_query_formats_all_layouts(AVFilterContext *ctx); /** * Create a list of supported formats. This is intended for use in |