[FFmpeg-devel] [PATCH v2] libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.

[Michael Niedermayer]

On Wed, Jun 10, 2015 at 07:55:52PM +0200, Simon Thelen wrote:
> Signed-off-by: Simon Thelen <ffmpeg-dev at c-14.de>
> ---
>  libavfilter/formats.c | 14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)

breaks fate

--- ./tests/ref/fate/filter-formats     2015-06-20 14:26:34.667819619 +0200
+++ tests/data/fate/filter-formats      2015-06-20 14:28:16.587821766 +0200
@@ -72,11 +72,11 @@
 0 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, 64, -1);
 0 = ff_parse_channel_layout(000000000000003C,  4, 60);
 0 = ff_parse_channel_layout(0000000000000041,  2, 65);
-0 = ff_parse_channel_layout(0000000000000000,  1, 1c);
-0 = ff_parse_channel_layout(0000000000000000,  2, 2c);
--1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c);
-0 = ff_parse_channel_layout(0000000000000000, 60, 60c);
--1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c);
+0 = ff_parse_channel_layout(0000000000000004,  1, 1c);
+0 = ff_parse_channel_layout(0000000000000003,  2, 2c);
+0 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, 64, -1c);
+0 = ff_parse_channel_layout(000000000000003C,  4, 60c);
+0 = ff_parse_channel_layout(0000000000000041,  2, 65c);
 0 = ff_parse_channel_layout(000000000000003F,  6, 5.1);
 0 = ff_parse_channel_layout(0000000000000003,  2, stereo);
 0 = ff_parse_channel_layout(0000000000000004,  1, 1+1+1+1);
Test filter-formats failed. Look at tests/data/fate/filter-formats.err for details.
make: *** [fate-filter-formats] Error 1

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

During times of universal deceit, telling the truth becomes a
revolutionary act. -- George Orwell
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150620/3885df86/attachment.asc>