From 977fd8841921f0109bee220e1f99dd662c166ae1 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Mon, 26 Dec 2016 02:03:37 +0100 Subject: avfilter/formats: do not allow unknown layouts in ff_parse_channel_layout if nret is not set Current code returned the number of channels as channel layout in that case, and if nret is not set then unknown layouts are typically not supported. Also use the common parsing code. Use a temporary workaround to parse an unknown channel layout such as '13c', after a 1 year grace period only '13C' will work. Signed-off-by: Marton Balint --- libavfilter/tests/formats.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavfilter/tests') diff --git a/libavfilter/tests/formats.c b/libavfilter/tests/formats.c index 0e8ba4ad15..5450742b68 100644 --- a/libavfilter/tests/formats.c +++ b/libavfilter/tests/formats.c @@ -39,6 +39,9 @@ int main(void) "-1c", "60c", "65c", + "2C", + "60C", + "65C", "5.1", "stereo", "1+1+1+1", -- cgit v1.2.3