diff options
| author | Marton Balint <cus@passwd.hu> | 2016-12-26 02:03:37 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2017-01-24 23:51:36 +0100 |
| commit | 977fd8841921f0109bee220e1f99dd662c166ae1 (patch) | |
| tree | a16f626ad67336bb9437f4d581f8658b894382f9 /libavfilter/tests | |
| parent | c4618f842a2de85097627763f02931afc3fde6d9 (diff) | |
| download | ffmpeg-977fd8841921f0109bee220e1f99dd662c166ae1.tar.gz | |
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 <cus@passwd.hu>
Diffstat (limited to 'libavfilter/tests')
| -rw-r--r-- | libavfilter/tests/formats.c | 3 |
1 files changed, 3 insertions, 0 deletions
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", |