[FFmpeg-devel,061/281] framehash: convert to new channel layout API

diff --git a/libavformat/framehash.c b/libavformat/framehash.c
index 04c40825b9..abe565548c 100644
--- a/libavformat/framehash.c
+++ b/libavformat/framehash.c
@@ -35,12 +35,14 @@  int ff_framehash_write_header(AVFormatContext *s)
         avio_printf(s->pb, "#media_type %d: %s\n", i, av_get_media_type_string(avctx->codec_type));
         avio_printf(s->pb, "#codec_id %d: %s\n", i, avcodec_get_name(avctx->codec_id));
         switch (avctx->codec_type) {
-        case AVMEDIA_TYPE_AUDIO:
-            av_get_channel_layout_string(buf, sizeof(buf), avctx->channels, avctx->channel_layout);
+        case AVMEDIA_TYPE_AUDIO: {
+            int ret = av_channel_layout_describe(&avctx->ch_layout, buf, sizeof(buf));
+            if (ret < 0)
+                return ret;
             avio_printf(s->pb, "#sample_rate %d: %d\n", i,avctx->sample_rate);
-            avio_printf(s->pb, "#channel_layout %d: %"PRIx64"\n", i,avctx->channel_layout);
             avio_printf(s->pb, "#channel_layout_name %d: %s\n", i, buf);
             break;
+            }
         case AVMEDIA_TYPE_VIDEO:
             avio_printf(s->pb, "#dimensions %d: %dx%d\n", i, avctx->width, avctx->height);
             avio_printf(s->pb, "#sar %d: %d/%d\n", i, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den);
diff --git a/tests/ref/fate/8bps b/tests/ref/fate/8bps
index dab2b908db..f736bb0b9a 100644
--- a/tests/ref/fate/8bps
+++ b/tests/ref/fate/8bps
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   259200, 0x7e91df07
 1,          0,          0,     1024,     2048, 0x3d042426
diff --git a/tests/ref/fate/aa-demux b/tests/ref/fate/aa-demux
index 89350b8803..9534c82eef 100644
--- a/tests/ref/fate/aa-demux
+++ b/tests/ref/fate/aa-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: sipr
 #sample_rate 0: 8500
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,    18000,       19, 0x36e10529
 0,      18000,      18000,    18000,       19, 0x70810a69
diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc
index 2a2823ef9a..b9bfb37142 100644
--- a/tests/ref/fate/aac-autobsf-adtstoasc
+++ b/tests/ref/fate/aac-autobsf-adtstoasc
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,       64,        4, 0x02f70117
 0,         64,         64,       64,      163, 0xd5f85007
diff --git a/tests/ref/fate/adpcm-4xm b/tests/ref/fate/adpcm-4xm
index cfde412da8..6278639b27 100644
--- a/tests/ref/fate/adpcm-4xm
+++ b/tests/ref/fate/adpcm-4xm
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1472,     5888, 0x9086e310
 0,       1476,       1476,     1472,     5888, 0xac8491f5
diff --git a/tests/ref/fate/adpcm-afc b/tests/ref/fate/adpcm-afc
index 6d8e732454..4caf7a8f93 100644
--- a/tests/ref/fate/adpcm-afc
+++ b/tests/ref/fate/adpcm-afc
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,    17920,    71680, 0x52373bc9
 0,      17920,      17920,    17920,    71680, 0x1f854b27
diff --git a/tests/ref/fate/adpcm-dtk b/tests/ref/fate/adpcm-dtk
index f3ade6d505..58305d6bd8 100644
--- a/tests/ref/fate/adpcm-dtk
+++ b/tests/ref/fate/adpcm-dtk
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      896,     3584, 0xdae789d5
 0,        896,        896,      896,     3584, 0x168ed9b6
diff --git a/tests/ref/fate/adpcm-ea-1 b/tests/ref/fate/adpcm-ea-1
index 76be8e8511..ea0ba2b04f 100644
--- a/tests/ref/fate/adpcm-ea-1
+++ b/tests/ref/fate/adpcm-ea-1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1484,     5936, 0x00000000
 0,       1484,       1484,     1456,     5824, 0x00000000
diff --git a/tests/ref/fate/adpcm-ea-2 b/tests/ref/fate/adpcm-ea-2
index 91440874a0..e0dc9dccfe 100644
--- a/tests/ref/fate/adpcm-ea-2
+++ b/tests/ref/fate/adpcm-ea-2
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1484,     5936, 0xea261a29
 0,       1484,       1484,     1456,     5824, 0x253df061
diff --git a/tests/ref/fate/adpcm-ea-maxis-xa b/tests/ref/fate/adpcm-ea-maxis-xa
index c919a67545..be2218424c 100644
--- a/tests/ref/fate/adpcm-ea-maxis-xa
+++ b/tests/ref/fate/adpcm-ea-maxis-xa
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,       28,      112, 0x291d1be4
 0,         28,         28,       28,      112, 0xf08d33cc
diff --git a/tests/ref/fate/adpcm-ea-r1 b/tests/ref/fate/adpcm-ea-r1
index 4e5fb6788f..46415e72a4 100644
--- a/tests/ref/fate/adpcm-ea-r1
+++ b/tests/ref/fate/adpcm-ea-r1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1624,     6496, 0x00000000
 0,       1624,       1624,     1596,     6384, 0x00000000
diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv
index 2f8c0a2cdf..37583cf810 100644
--- a/tests/ref/fate/adpcm-ima-amv
+++ b/tests/ref/fate/adpcm-ima-amv
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1378,     2756, 0x0af35034
 0,       1378,       1378,     1378,     2756, 0x8462443f
diff --git a/tests/ref/fate/adpcm-ima-ea-eacs b/tests/ref/fate/adpcm-ima-ea-eacs
index fcfcbeb175..62da571d7f 100644
--- a/tests/ref/fate/adpcm-ima-ea-eacs
+++ b/tests/ref/fate/adpcm-ima-ea-eacs
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1468,     5872, 0x00000000
 0,       1468,       1468,     1468,     5872, 0x00000000
diff --git a/tests/ref/fate/adpcm-ima-ea-sead b/tests/ref/fate/adpcm-ima-ea-sead
index 2d52efe3c0..f78bbe8431 100644
--- a/tests/ref/fate/adpcm-ima-ea-sead
+++ b/tests/ref/fate/adpcm-ima-ea-sead
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      736,     2944, 0x00000000
 0,        736,        736,     1472,     5888, 0x5ae3c2a4
diff --git a/tests/ref/fate/adpcm-ima-smjpeg b/tests/ref/fate/adpcm-ima-smjpeg
index a216e3ab5e..723fa2336e 100644
--- a/tests/ref/fate/adpcm-ima-smjpeg
+++ b/tests/ref/fate/adpcm-ima-smjpeg
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      512,     1024, 0x00000000
 0,        512,        512,      512,     1024, 0x00000000
diff --git a/tests/ref/fate/adpcm-ima-ws b/tests/ref/fate/adpcm-ima-ws
index b382812d22..5431538bf4 100644
--- a/tests/ref/fate/adpcm-ima-ws
+++ b/tests/ref/fate/adpcm-ima-ws
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,    11024,    22048, 0x0843bbad
 0,      11024,      11024,     1470,     2940, 0x16ff454e
diff --git a/tests/ref/fate/adpcm-ima-ws-vqa3 b/tests/ref/fate/adpcm-ima-ws-vqa3
index c2f14cd1a8..9c2c6b175b 100644
--- a/tests/ref/fate/adpcm-ima-ws-vqa3
+++ b/tests/ref/fate/adpcm-ima-ws-vqa3
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1470,     2940, 0xca80b853
 0,       1470,       1470,     1470,     2940, 0x250c9f84
diff --git a/tests/ref/fate/adpcm-ms-mono b/tests/ref/fate/adpcm-ms-mono
index e3f217d18e..9823ba77b5 100644
--- a/tests/ref/fate/adpcm-ms-mono
+++ b/tests/ref/fate/adpcm-ms-mono
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 11025
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      500,     1000, 0x64cd9403
 0,        500,        500,      500,     1000, 0xa4ef8a9d
diff --git a/tests/ref/fate/adpcm-thp b/tests/ref/fate/adpcm-thp
index 592c6610ad..221b2b90b3 100644
--- a/tests/ref/fate/adpcm-thp
+++ b/tests/ref/fate/adpcm-thp
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 32000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1078,     4312, 0x469714f6
 0,       1078,       1078,     1064,     4256, 0x6ca28f25
diff --git a/tests/ref/fate/adpcm-vima b/tests/ref/fate/adpcm-vima
index b22f128be5..21b8cc4a58 100644
--- a/tests/ref/fate/adpcm-vima
+++ b/tests/ref/fate/adpcm-vima
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,    73500,   294000, 0x37d439ee
 0,      73500,      73500,     1470,     5880, 0xe524b177
diff --git a/tests/ref/fate/adpcm-xa b/tests/ref/fate/adpcm-xa
index 15b62ec4a5..5207fe743e 100644
--- a/tests/ref/fate/adpcm-xa
+++ b/tests/ref/fate/adpcm-xa
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 37800
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     2016,     8064, 0xa307ed8c
 0,       2016,       2016,     2016,     8064, 0xd2551927
diff --git a/tests/ref/fate/adts-id3v1-demux b/tests/ref/fate/adts-id3v1-demux
index 7caa5d6870..bd8f5b1193 100644
--- a/tests/ref/fate/adts-id3v1-demux
+++ b/tests/ref/fate/adts-id3v1-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,   602112,      474, 0x4c90e7c4
 0,     602112,     602112,   602112,      471, 0xb8b5e75d
diff --git a/tests/ref/fate/adts-id3v2-demux b/tests/ref/fate/adts-id3v2-demux
index db00e3b81e..710350988a 100644
--- a/tests/ref/fate/adts-id3v2-demux
+++ b/tests/ref/fate/adts-id3v2-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 48000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,   602112,      126, 0x639a3a5b
 0,     602112,     602112,   602112,      135, 0x5b1f3ced
diff --git a/tests/ref/fate/adts-id3v2-two-tags-demux b/tests/ref/fate/adts-id3v2-two-tags-demux
index 4fffd2e767..5fd8c52f28 100644
--- a/tests/ref/fate/adts-id3v2-two-tags-demux
+++ b/tests/ref/fate/adts-id3v2-two-tags-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 48000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,   602112,      128, 0x23291993
 0,     602112,     602112,   602112,      128, 0x23291993
diff --git a/tests/ref/fate/adtstoasc_ticket3715 b/tests/ref/fate/adtstoasc_ticket3715
index fbdeeb0582..78d9e71979 100644
--- a/tests/ref/fate/adtstoasc_ticket3715
+++ b/tests/ref/fate/adtstoasc_ticket3715
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,      371, 0x14b11a4f
 0,       1024,       1024,     1024,      402, 0x2f00c487
diff --git a/tests/ref/fate/amrnb-remux b/tests/ref/fate/amrnb-remux
index 4a78c479f2..31d20981a2 100644
--- a/tests/ref/fate/amrnb-remux
+++ b/tests/ref/fate/amrnb-remux
@@ -4,7 +4,6 @@ 
 #media_type 0: audio
 #codec_id 0: amr_nb
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      160,       27, 0xc9970c51
 0,        160,        160,      160,       27, 0xbaa00d05
diff --git a/tests/ref/fate/amrwb-remux b/tests/ref/fate/amrwb-remux
index c350fc0b61..0fd3e457f2 100644
--- a/tests/ref/fate/amrwb-remux
+++ b/tests/ref/fate/amrwb-remux
@@ -4,7 +4,6 @@ 
 #media_type 0: audio
 #codec_id 0: amr_wb
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      320,       61, 0xc8891fe9
 0,        320,        320,      320,       61, 0xc2562027
diff --git a/tests/ref/fate/armovie-escape124 b/tests/ref/fate/armovie-escape124
index 398ff767b6..ce99446191 100644
--- a/tests/ref/fate/armovie-escape124
+++ b/tests/ref/fate/armovie-escape124
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,   230400, 0xd133e177
 1,          0,          0,    44100,   176400, 0xdd61578c
diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid
index 25a62ae515..a6a0f41af8 100644
--- a/tests/ref/fate/bethsoft-vid
+++ b/tests/ref/fate/bethsoft-vid
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11111
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   192000, 0x00000000
 1,          0,          0,      740,     1480, 0x00000000
diff --git a/tests/ref/fate/bfi b/tests/ref/fate/bfi
index 277c93543e..e7583a7cd2 100644
--- a/tests/ref/fate/bfi
+++ b/tests/ref/fate/bfi
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11025
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   134400, 0xc218b00c
 1,          0,          0,     8884,    17768, 0x07df135c
diff --git a/tests/ref/fate/bmv-audio b/tests/ref/fate/bmv-audio
index 6e1a4c2fe9..6de8b995cc 100644
--- a/tests/ref/fate/bmv-audio
+++ b/tests/ref/fate/bmv-audio
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1856,     7424, 0x18540b36
 0,       1856,       1856,     1824,     7296, 0x5acd2484
diff --git a/tests/ref/fate/caf-alac-remux b/tests/ref/fate/caf-alac-remux
index 97275fd317..f33182b721 100644
--- a/tests/ref/fate/caf-alac-remux
+++ b/tests/ref/fate/caf-alac-remux
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: alac
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,        0,       32, 0xa0af0dfe
 0,       4096,       4096,        0,     6701, 0xa9ddc14e
diff --git a/tests/ref/fate/caf-amr_nb-remux b/tests/ref/fate/caf-amr_nb-remux
index 0eed36a5cb..7ae3a74741 100644
--- a/tests/ref/fate/caf-amr_nb-remux
+++ b/tests/ref/fate/caf-amr_nb-remux
@@ -5,7 +5,6 @@  a00bd18f70b66286e67d84f0df034a48 *tests/data/fate/caf-amr_nb-remux.caf
 #media_type 0: audio
 #codec_id 0: amr_nb
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      160,       13, 0x2bf906f6
 0,        160,        160,      160,       13, 0x28bd0756
diff --git a/tests/ref/fate/caf-mace6-remux b/tests/ref/fate/caf-mace6-remux
index 3a0499d793..e674365b3d 100644
--- a/tests/ref/fate/caf-mace6-remux
+++ b/tests/ref/fate/caf-mace6-remux
@@ -4,7 +4,6 @@ 
 #media_type 0: audio
 #codec_id 0: mace6
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,        6,        1, 0x00900090
 0,          6,          6,        6,        1, 0x00870087
diff --git a/tests/ref/fate/caf-pcm_s24-remux b/tests/ref/fate/caf-pcm_s24-remux
index bb3136ef7d..618f6f73e4 100644
--- a/tests/ref/fate/caf-pcm_s24-remux
+++ b/tests/ref/fate/caf-pcm_s24-remux
@@ -4,7 +4,6 @@  d696d9dc23a82c51c4761f5792e7fa37 *tests/data/fate/caf-pcm_s24-remux.caf
 #media_type 0: audio
 #codec_id 0: pcm_s24be
 #sample_rate 0: 192000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      682,     4092, 0x71f10ea0
 0,        682,        682,      682,     4092, 0x51852317
diff --git a/tests/ref/fate/caf-pcm_s24le-remux b/tests/ref/fate/caf-pcm_s24le-remux
index 9520e423cd..bab814c5e3 100644
--- a/tests/ref/fate/caf-pcm_s24le-remux
+++ b/tests/ref/fate/caf-pcm_s24le-remux
@@ -4,7 +4,6 @@  ee0072a92044cbad68795cf93546c517 *tests/data/fate/caf-pcm_s24le-remux.caf
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 192000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      682,     4092, 0xa6320ea0
 0,        682,        682,      682,     4092, 0x27732317
diff --git a/tests/ref/fate/caf-qdm2-remux b/tests/ref/fate/caf-qdm2-remux
index a3bde1264b..d4f658c163 100644
--- a/tests/ref/fate/caf-qdm2-remux
+++ b/tests/ref/fate/caf-qdm2-remux
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: qdm2
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,        0,      370, 0x4d1897fc
 0,       4096,       4096,        0,      370, 0xea999da0
diff --git a/tests/ref/fate/cdxl-demux b/tests/ref/fate/cdxl-demux
index 324a40f2dc..9b71b18910 100644
--- a/tests/ref/fate/cdxl-demux
+++ b/tests/ref/fate/cdxl-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s8_planar
 #sample_rate 1: 11025
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,    22688, 0xc954a244
 1,          0,          0,     1884,     1884, 0x06925e3e
diff --git a/tests/ref/fate/copy-psp b/tests/ref/fate/copy-psp
index 8b2cef87fa..977bef5c3e 100644
--- a/tests/ref/fate/copy-psp
+++ b/tests/ref/fate/copy-psp
@@ -11,7 +11,6 @@ 
 #media_type 1: audio
 #codec_id 1: aac
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,     3003,    37084, 0x021a0d3f
 1,          0,          0,     1024,       10, 0x0e270398
diff --git a/tests/ref/fate/copy-shortest1 b/tests/ref/fate/copy-shortest1
index 69204b373a..5038973e4e 100644
--- a/tests/ref/fate/copy-shortest1
+++ b/tests/ref/fate/copy-shortest1
@@ -11,7 +11,6 @@ 
 #media_type 1: audio
 #codec_id 1: ac3
 #sample_rate 1: 44100
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 #stream#, dts,        pts, duration,     size, hash
 1,       -256,       -256,     1536,      416, e3bd415f62aa927e9273151fdf21ebce
diff --git a/tests/ref/fate/copy-shortest2 b/tests/ref/fate/copy-shortest2
index 69204b373a..5038973e4e 100644
--- a/tests/ref/fate/copy-shortest2
+++ b/tests/ref/fate/copy-shortest2
@@ -11,7 +11,6 @@ 
 #media_type 1: audio
 #codec_id 1: ac3
 #sample_rate 1: 44100
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 #stream#, dts,        pts, duration,     size, hash
 1,       -256,       -256,     1536,      416, e3bd415f62aa927e9273151fdf21ebce
diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236
index c34b309b3f..5a9e08ad0c 100644
--- a/tests/ref/fate/copy-trac236
+++ b/tests/ref/fate/copy-trac236
@@ -9,7 +9,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,   518400, 0x81ab2140
 1,          0,          0,     1024,     4096, 0x67dc99a3
diff --git a/tests/ref/fate/copy-trac3074 b/tests/ref/fate/copy-trac3074
index 2ef7e702cd..b6d23f8c1c 100644
--- a/tests/ref/fate/copy-trac3074
+++ b/tests/ref/fate/copy-trac3074
@@ -4,7 +4,6 @@ 
 #media_type 0: audio
 #codec_id 0: eac3
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1536,      512, 0x2beaf79f, S=1,        4
 0,       1536,       1536,     1536,      512, 0x29ddf9d6
diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914
index 743dc8c055..b80db6522f 100644
--- a/tests/ref/fate/copy-trac4914
+++ b/tests/ref/fate/copy-trac4914
@@ -9,7 +9,6 @@  f5150fb82c1bb5a90906fce93dcc3f76 *tests/data/fate/copy-trac4914.mxf
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,   259200, 0xf36957da
 1,          0,          0,     1602,     6408, 0x1dd7b37c
diff --git a/tests/ref/fate/copy-trac4914-avi b/tests/ref/fate/copy-trac4914-avi
index 0358ead6b8..20006ea05c 100644
--- a/tests/ref/fate/copy-trac4914-avi
+++ b/tests/ref/fate/copy-trac4914-avi
@@ -9,7 +9,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 1,          0,          0,     1152,     4608, 0xb24f5c9d
 1,       1152,       1152,     1152,     4608, 0xe2da5c32
diff --git a/tests/ref/fate/corepng b/tests/ref/fate/corepng
index 74bb920108..942ceceb95 100644
--- a/tests/ref/fate/corepng
+++ b/tests/ref/fate/corepng
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11025
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   230400, 0x03e25ead
 1,          0,          0,     5513,    11026, 0x27ad637c
diff --git a/tests/ref/fate/cover-art-aiff-id3v2-remux b/tests/ref/fate/cover-art-aiff-id3v2-remux
index c294c5013e..3ca2855eb8 100644
--- a/tests/ref/fate/cover-art-aiff-id3v2-remux
+++ b/tests/ref/fate/cover-art-aiff-id3v2-remux
@@ -4,7 +4,6 @@  d4a9481090a8bab1a3f072a8108a1d6a *tests/data/fate/cover-art-aiff-id3v2-remux.aif
 #media_type 0: audio
 #codec_id 0: pcm_s16be
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #tb 1: 1/90000
 #media_type 1: video
diff --git a/tests/ref/fate/cover-art-flac-remux b/tests/ref/fate/cover-art-flac-remux
index 3f779828ae..aeb229f853 100644
--- a/tests/ref/fate/cover-art-flac-remux
+++ b/tests/ref/fate/cover-art-flac-remux
@@ -5,8 +5,7 @@ 
 #media_type 0: audio
 #codec_id 0: flac
 #sample_rate 0: 44100
-#channel_layout 0: 5
-#channel_layout_name 0: 2 channels (FL+FC)
+#channel_layout_name 0: FL+FC
 #tb 1: 1/90000
 #media_type 1: video
 #codec_id 1: png
@@ -36,8 +35,7 @@ 
 #media_type 6: audio
 #codec_id 6: pcm_s16le
 #sample_rate 6: 44100
-#channel_layout 6: 5
-#channel_layout_name 6: 2 channels (FL+FC)
+#channel_layout_name 6: FL+FC
 0,          0,          0,     4608,       14, 0x242b036d
 1,          0,          0,        0,    66888, 0x1fd72743
 2,          0,          0,        0,   438706, 0x8bcb753b
diff --git a/tests/ref/fate/cover-art-mp3-id3v2-remux b/tests/ref/fate/cover-art-mp3-id3v2-remux
index 457f1d5a08..906a646799 100644
--- a/tests/ref/fate/cover-art-mp3-id3v2-remux
+++ b/tests/ref/fate/cover-art-mp3-id3v2-remux
@@ -4,7 +4,6 @@  c1b55a9a92226cd72d3f53ccd830d127 *tests/data/fate/cover-art-mp3-id3v2-remux.mp3
 #media_type 0: audio
 #codec_id 0: mp3
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #tb 1: 1/90000
 #media_type 1: video
diff --git a/tests/ref/fate/creatureshock-avs b/tests/ref/fate/creatureshock-avs
index c8e08c9ff7..19648202b8 100644
--- a/tests/ref/fate/creatureshock-avs
+++ b/tests/ref/fate/creatureshock-avs
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22222
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   188892, 0x9f47a5ec
 1,          0,          0,     8186,    16372, 0xfaaab59d
diff --git a/tests/ref/fate/cyberia-c93 b/tests/ref/fate/cyberia-c93
index e7a5b5a08d..813ef46829 100644
--- a/tests/ref/fate/cyberia-c93
+++ b/tests/ref/fate/cyberia-c93
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 16129
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   184320, 0x8433f0f8
 1,          0,          0,    14184,    28368, 0xaacc96a5
diff --git a/tests/ref/fate/d-cinema-demux b/tests/ref/fate/d-cinema-demux
index 74d00f7bb2..f1e8b5f755 100644
--- a/tests/ref/fate/d-cinema-demux
+++ b/tests/ref/fate/d-cinema-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24daud
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 0,          0,          0,     1875,    36000, 0xd592781d
 0,       1875,       1875,     1875,    36000, 0xd592781d
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0 b/tests/ref/fate/dca-xll_51_16_192_768_0
index 6e62c616e2..756d11d868 100644
--- a/tests/ref/fate/dca-xll_51_16_192_768_0
+++ b/tests/ref/fate/dca-xll_51_16_192_768_0
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
index 6e62c616e2..756d11d868 100644
--- a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
+++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
index 6e62c616e2..756d11d868 100644
--- a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
+++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1 b/tests/ref/fate/dca-xll_51_16_192_768_1
index 6e62c616e2..756d11d868 100644
--- a/tests/ref/fate/dca-xll_51_16_192_768_1
+++ b/tests/ref/fate/dca-xll_51_16_192_768_1
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
index 17896a7cca..21a574fd90 100644
--- a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
+++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,     8192, 0829f71740aab1ab98b33eae21dee122
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
index 6e62c616e2..756d11d868 100644
--- a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
+++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 192000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
diff --git a/tests/ref/fate/dca-xll_51_24_48_768 b/tests/ref/fate/dca-xll_51_24_48_768
index 2d10583b49..96c936bdc2 100644
--- a/tests/ref/fate/dca-xll_51_24_48_768
+++ b/tests/ref/fate/dca-xll_51_24_48_768
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
index be22d7d98e..0527069aef 100644
--- a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
+++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     3072, d2a70550489de356a2cd6bfc40711204
diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
index 2d10583b49..96c936bdc2 100644
--- a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
+++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
diff --git a/tests/ref/fate/dca-xll_51_24_48_none b/tests/ref/fate/dca-xll_51_24_48_none
index 17cfd0edb2..6c5b48b26b 100644
--- a/tests/ref/fate/dca-xll_51_24_48_none
+++ b/tests/ref/fate/dca-xll_51_24_48_none
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
index 17cfd0edb2..6c5b48b26b 100644
--- a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
+++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
index 17cfd0edb2..6c5b48b26b 100644
--- a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
+++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0 b/tests/ref/fate/dca-xll_71_24_48_768_0
index a295d41a92..e74e54d44e 100644
--- a/tests/ref/fate/dca-xll_71_24_48_768_0
+++ b/tests/ref/fate/dca-xll_71_24_48_768_0
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 63f
 #channel_layout_name 0: 7.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,    12288, ca9f8c8eb1b9b311cb79999fa376c7f0
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
index f9b7b655a5..2787b6751d 100644
--- a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
+++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
index f9b7b655a5..2787b6751d 100644
--- a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
+++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1 b/tests/ref/fate/dca-xll_71_24_48_768_1
index a295d41a92..e74e54d44e 100644
--- a/tests/ref/fate/dca-xll_71_24_48_768_1
+++ b/tests/ref/fate/dca-xll_71_24_48_768_1
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 63f
 #channel_layout_name 0: 7.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,    12288, ca9f8c8eb1b9b311cb79999fa376c7f0
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
index 5b01746258..57f1dab0b1 100644
--- a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
+++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     3072, d2a70550489de356a2cd6bfc40711204
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
index 246b5e0133..5f847e65c4 100644
--- a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
+++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
diff --git a/tests/ref/fate/dca-xll_71_24_96_768 b/tests/ref/fate/dca-xll_71_24_96_768
index 418b4b136d..df8ec4da7b 100644
--- a/tests/ref/fate/dca-xll_71_24_96_768
+++ b/tests/ref/fate/dca-xll_71_24_96_768
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
-#channel_layout 0: 63f
 #channel_layout_name 0: 7.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    24576, 0b24a527d66f2b0cab97f37e4cd79987
diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
index 9bd0256c31..b57af93a10 100644
--- a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
+++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, 0a675f172b0e1a171c46dfaa4f1d0f00
diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
index 9bd0256c31..b57af93a10 100644
--- a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
+++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, 0a675f172b0e1a171c46dfaa4f1d0f00
diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509 b/tests/ref/fate/dca-xll_x96_51_24_96_1509
index bc83f793a0..838b1dea54 100644
--- a/tests/ref/fate/dca-xll_x96_51_24_96_1509
+++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
index bc83f793a0..838b1dea54 100644
--- a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
+++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
index bc83f793a0..838b1dea54 100644
--- a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
+++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768 b/tests/ref/fate/dca-xll_xch_61_24_48_768
index 19816d93d3..c0eb4aed5f 100644
--- a/tests/ref/fate/dca-xll_xch_61_24_48_768
+++ b/tests/ref/fate/dca-xll_xch_61_24_48_768
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 70f
 #channel_layout_name 0: 6.1
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,    10752, c3c5b236c266a9090378def1ad497a21
diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
index 1f6989fbe4..0e69ebcf94 100644
--- a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
+++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 652c4e61f9abe9fba9de792242e2d31d
diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
index 1f6989fbe4..0e69ebcf94 100644
--- a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
+++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s24le
 #sample_rate 0: 48000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      512,     9216, 652c4e61f9abe9fba9de792242e2d31d
diff --git a/tests/ref/fate/dcinema-encode b/tests/ref/fate/dcinema-encode
index cc53488be1..471820dbda 100644
--- a/tests/ref/fate/dcinema-encode
+++ b/tests/ref/fate/dcinema-encode
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 96000
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      341,     4092, 697cddfcd0e21f24782af0705b7048f3
diff --git a/tests/ref/fate/delphine-cin-audio b/tests/ref/fate/delphine-cin-audio
index 6fdc8048e4..c144dc68f7 100644
--- a/tests/ref/fate/delphine-cin-audio
+++ b/tests/ref/fate/delphine-cin-audio
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,    88224,   176448, 0x541ddc55
 0,      88224,      88224,     1838,     3676, 0xaf455081
diff --git a/tests/ref/fate/dpcm-idroq b/tests/ref/fate/dpcm-idroq
index fb45ace2c6..98b50a1f8f 100644
--- a/tests/ref/fate/dpcm-idroq
+++ b/tests/ref/fate/dpcm-idroq
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     7456,    29824, 0x77e265b7
 0,       7456,       7456,      736,     2944, 0x8dcdf50b
diff --git a/tests/ref/fate/dpcm-interplay b/tests/ref/fate/dpcm-interplay
index 720a98f389..207ef48e91 100644
--- a/tests/ref/fate/dpcm-interplay
+++ b/tests/ref/fate/dpcm-interplay
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1462,     5848, 0xea04292b
 0,       1462,       1462,     1472,     5888, 0x0e59e942
diff --git a/tests/ref/fate/dss-lp b/tests/ref/fate/dss-lp
index ab1d5344b5..9b08345d05 100644
--- a/tests/ref/fate/dss-lp
+++ b/tests/ref/fate/dss-lp
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xf1107658
 0,        240,        240,      240,      480, 0x50dee179
diff --git a/tests/ref/fate/dss-sp b/tests/ref/fate/dss-sp
index f407ce7da0..0984f11ebc 100644
--- a/tests/ref/fate/dss-sp
+++ b/tests/ref/fate/dss-sp
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 11025
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      264,      528, 0xa2579e96
 0,        264,        264,      264,      528, 0xf9b23172
diff --git a/tests/ref/fate/ffmpeg-attached_pics b/tests/ref/fate/ffmpeg-attached_pics
index 48c7ced363..515bef3ca4 100644
--- a/tests/ref/fate/ffmpeg-attached_pics
+++ b/tests/ref/fate/ffmpeg-attached_pics
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,   120000, 0x748cc771
 1,          0,          0,     4096,    16384, 0x00000000
diff --git a/tests/ref/fate/ffmpeg-filter_complex_audio b/tests/ref/fate/ffmpeg-filter_complex_audio
index c424675061..0d1f650040 100644
--- a/tests/ref/fate/ffmpeg-filter_complex_audio
+++ b/tests/ref/fate/ffmpeg-filter_complex_audio
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: ac3
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,       -256,       -256,     1536,      416, 0x3001fb2d
 0,       1280,       1280,     1536,      418, 0xba72fc16
diff --git a/tests/ref/fate/filter-acrossfade b/tests/ref/fate/filter-acrossfade
index 8d524c4d2e..8737d9da57 100644
--- a/tests/ref/fate/filter-acrossfade
+++ b/tests/ref/fate/filter-acrossfade
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      888,     3552, 0x592ce6cc
 0,        888,        888,     1024,     4096, 0x20f6f6a9
diff --git a/tests/ref/fate/filter-adelay b/tests/ref/fate/filter-adelay
index e3ff763602..6370f66f71 100644
--- a/tests/ref/fate/filter-adelay
+++ b/tests/ref/fate/filter-adelay
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x9d7bf760
 0,       1024,       1024,     1024,     4096, 0xdf42c46b
diff --git a/tests/ref/fate/filter-aecho b/tests/ref/fate/filter-aecho
index 2c88c37fbc..706e17e10c 100644
--- a/tests/ref/fate/filter-aecho
+++ b/tests/ref/fate/filter-aecho
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x3019edd5
 0,       1024,       1024,     1024,     4096, 0x2df2fe2f
diff --git a/tests/ref/fate/filter-aemphasis b/tests/ref/fate/filter-aemphasis
index 9509e4319a..143a434972 100644
--- a/tests/ref/fate/filter-aemphasis
+++ b/tests/ref/fate/filter-aemphasis
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 0,          0,          0,     1024,     4096, 0xb9c5fefd
 0,       1024,       1024,     1024,     4096, 0xb2ae0a90
 0,       2048,       2048,     1024,     4096, 0x97e6e9f3
@@ -266,7 +265,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 0,          0,          0,     1024,     4096, 0xfd510c8e
 0,       1024,       1024,     1024,     4096, 0x09dcf895
 0,       2048,       2048,     1024,     4096, 0xd8cbe29f
diff --git a/tests/ref/fate/filter-aemphasis-50fm b/tests/ref/fate/filter-aemphasis-50fm
index 649cd449be..d28a7538bf 100644
--- a/tests/ref/fate/filter-aemphasis-50fm
+++ b/tests/ref/fate/filter-aemphasis-50fm
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xb9c5fefd
 0,       1024,       1024,     1024,     4096, 0xb2ae0a90
diff --git a/tests/ref/fate/filter-aemphasis-75kf b/tests/ref/fate/filter-aemphasis-75kf
index 5705e98338..765f32ec4c 100644
--- a/tests/ref/fate/filter-aemphasis-75kf
+++ b/tests/ref/fate/filter-aemphasis-75kf
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x7b2101ec
 0,       1024,       1024,     1024,     4096, 0x5c16fc93
diff --git a/tests/ref/fate/filter-afade-esin b/tests/ref/fate/filter-afade-esin
index f9b910c693..41dfaeb565 100644
--- a/tests/ref/fate/filter-afade-esin
+++ b/tests/ref/fate/filter-afade-esin
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x06e0d68a
 0,       1024,       1024,     1024,     4096, 0xb325d915
diff --git a/tests/ref/fate/filter-afade-exp b/tests/ref/fate/filter-afade-exp
index a0c519cd8b..2a75db1986 100644
--- a/tests/ref/fate/filter-afade-exp
+++ b/tests/ref/fate/filter-afade-exp
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x00000000
 0,       1024,       1024,     1024,     4096, 0x00000000
diff --git a/tests/ref/fate/filter-afade-hsin b/tests/ref/fate/filter-afade-hsin
index 2c6a0e3a1e..b95bac047c 100644
--- a/tests/ref/fate/filter-afade-hsin
+++ b/tests/ref/fate/filter-afade-hsin
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x2042232e
 0,       1024,       1024,     1024,     4096, 0x2c073cf7
diff --git a/tests/ref/fate/filter-afade-iqsin b/tests/ref/fate/filter-afade-iqsin
index fc22baf913..9caa3203a9 100644
--- a/tests/ref/fate/filter-afade-iqsin
+++ b/tests/ref/fate/filter-afade-iqsin
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x220e908d
 0,       1024,       1024,     1024,     4096, 0xdd65002e
diff --git a/tests/ref/fate/filter-afade-log b/tests/ref/fate/filter-afade-log
index 99ac0b36d8..f3ba265a68 100644
--- a/tests/ref/fate/filter-afade-log
+++ b/tests/ref/fate/filter-afade-log
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xf01adbd3
 0,       1024,       1024,     1024,     4096, 0xbbe10f8e
diff --git a/tests/ref/fate/filter-afade-qsin b/tests/ref/fate/filter-afade-qsin
index 026fbbcc44..df3005edbc 100644
--- a/tests/ref/fate/filter-afade-qsin
+++ b/tests/ref/fate/filter-afade-qsin
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xd977ce0f
 0,       1024,       1024,     1024,     4096, 0x9333f5b1
diff --git a/tests/ref/fate/filter-agate b/tests/ref/fate/filter-agate
index b6e732a86e..e2d9c2ac24 100644
--- a/tests/ref/fate/filter-agate
+++ b/tests/ref/fate/filter-agate
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x1af20090
 0,       1024,       1024,     1024,     4096, 0x0b05ef2d
diff --git a/tests/ref/fate/filter-alimiter b/tests/ref/fate/filter-alimiter
index aef9765a83..56cfb614da 100644
--- a/tests/ref/fate/filter-alimiter
+++ b/tests/ref/fate/filter-alimiter
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xd4194af4
 0,       1024,       1024,     1024,     4096, 0x686af4ab
diff --git a/tests/ref/fate/filter-amerge b/tests/ref/fate/filter-amerge
index b3e5eb50cc..89c07029fd 100644
--- a/tests/ref/fate/filter-amerge
+++ b/tests/ref/fate/filter-amerge
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     2048,     8192, 0x120efa65
 0,       2048,       2048,     2048,     8192, 0x7b3cebf7
diff --git a/tests/ref/fate/filter-anequalizer b/tests/ref/fate/filter-anequalizer
index caed836bdf..250c9ede91 100644
--- a/tests/ref/fate/filter-anequalizer
+++ b/tests/ref/fate/filter-anequalizer
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x8e1bf8e0
 0,       1024,       1024,     1024,     4096, 0xe315f564
diff --git a/tests/ref/fate/filter-apad b/tests/ref/fate/filter-apad
index 9bf662d46a..79ed050a4b 100644
--- a/tests/ref/fate/filter-apad
+++ b/tests/ref/fate/filter-apad
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x29e3eecf
 0,       1024,       1024,     1024,     4096, 0x18390b96
diff --git a/tests/ref/fate/filter-asetnsamples-nopad b/tests/ref/fate/filter-asetnsamples-nopad
index c1cc01a710..e5306d4516 100644
--- a/tests/ref/fate/filter-asetnsamples-nopad
+++ b/tests/ref/fate/filter-asetnsamples-nopad
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      512,     2048, 0xd2dbf701
 0,        512,        512,      512,     2048, 0xdb22f7bf
diff --git a/tests/ref/fate/filter-asetnsamples-pad b/tests/ref/fate/filter-asetnsamples-pad
index 23cf11b8af..80f6e1d574 100644
--- a/tests/ref/fate/filter-asetnsamples-pad
+++ b/tests/ref/fate/filter-asetnsamples-pad
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      512,     2048, 0xd2dbf701
 0,        512,        512,      512,     2048, 0xdb22f7bf
diff --git a/tests/ref/fate/filter-asetrate b/tests/ref/fate/filter-asetrate
index 6ffa940361..4b5e87d69e 100644
--- a/tests/ref/fate/filter-asetrate
+++ b/tests/ref/fate/filter-asetrate
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 20000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x29e3eecf
 0,       1024,       1024,     1024,     4096, 0x18390b96
diff --git a/tests/ref/fate/filter-atrim-duration b/tests/ref/fate/filter-atrim-duration
index fafda1717f..1c4cf57128 100644
--- a/tests/ref/fate/filter-atrim-duration
+++ b/tests/ref/fate/filter-atrim-duration
@@ -2,6 +2,5 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,       4410,       4410,      441,     1764, 0x61e374f7
diff --git a/tests/ref/fate/filter-atrim-mixed b/tests/ref/fate/filter-atrim-mixed
index 4cd1d8004f..7f16639406 100644
--- a/tests/ref/fate/filter-atrim-mixed
+++ b/tests/ref/fate/filter-atrim-mixed
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,       1025,       1025,     1023,     4092, 0x78560a4c
 0,       2048,       2048,     1024,     4096, 0xc477fa99
diff --git a/tests/ref/fate/filter-atrim-samples b/tests/ref/fate/filter-atrim-samples
index 2d8c9a5235..74dc5d3b26 100644
--- a/tests/ref/fate/filter-atrim-samples
+++ b/tests/ref/fate/filter-atrim-samples
@@ -2,6 +2,5 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,         26,         26,       54,      216, 0x6b376c6c
diff --git a/tests/ref/fate/filter-atrim-time b/tests/ref/fate/filter-atrim-time
index a0c626c4ba..2f8d87ecbe 100644
--- a/tests/ref/fate/filter-atrim-time
+++ b/tests/ref/fate/filter-atrim-time
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,       4410,       4410,      710,     2840, 0x658982a3
 0,       5120,       5120,     1024,     4096, 0xfd6a0070
diff --git a/tests/ref/fate/filter-chorus b/tests/ref/fate/filter-chorus
index 211e60ecb1..97c7919655 100644
--- a/tests/ref/fate/filter-chorus
+++ b/tests/ref/fate/filter-chorus
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     2048,     4096, 0x1fc6f1f1
 0,       2048,       2048,     2048,     4096, 0xe5f7f442
diff --git a/tests/ref/fate/filter-compand b/tests/ref/fate/filter-compand
index ac9095f4e3..285416172e 100644
--- a/tests/ref/fate/filter-compand
+++ b/tests/ref/fate/filter-compand
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xfc10e61b
 0,       1024,       1024,     1024,     4096, 0x8801ef13
diff --git a/tests/ref/fate/filter-concat b/tests/ref/fate/filter-concat
index 022697ec5b..42879a45e0 100644
--- a/tests/ref/fate/filter-concat
+++ b/tests/ref/fate/filter-concat
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   230400, 0x88c4d19a
 1,          0,          0,     1024,     2048, 0xb3f10192
diff --git a/tests/ref/fate/filter-concat-vfr b/tests/ref/fate/filter-concat-vfr
index 0dece67a07..7c5e12e093 100644
--- a/tests/ref/fate/filter-concat-vfr
+++ b/tests/ref/fate/filter-concat-vfr
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        0,   230400, 0x88c4d19a
 1,          0,          0,     1024,     2048, 0xb3f10192
diff --git a/tests/ref/fate/filter-dcshift b/tests/ref/fate/filter-dcshift
index dad3df3ff0..4ad1401a9e 100644
--- a/tests/ref/fate/filter-dcshift
+++ b/tests/ref/fate/filter-dcshift
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x96868842
 0,       1024,       1024,     1024,     4096, 0xeff98700
diff --git a/tests/ref/fate/filter-earwax b/tests/ref/fate/filter-earwax
index 6bfa725b64..7626482899 100644
--- a/tests/ref/fate/filter-earwax
+++ b/tests/ref/fate/filter-earwax
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xb7e1f437
 0,       1024,       1024,     1024,     4096, 0xa031042a
diff --git a/tests/ref/fate/filter-extrastereo b/tests/ref/fate/filter-extrastereo
index 179c167792..a94d5f2e95 100644
--- a/tests/ref/fate/filter-extrastereo
+++ b/tests/ref/fate/filter-extrastereo
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x29e3eecf
 0,       1024,       1024,     1024,     4096, 0x18390b96
diff --git a/tests/ref/fate/filter-hls b/tests/ref/fate/filter-hls
index ee3c7b2c62..ed0ecc8e76 100644
--- a/tests/ref/fate/filter-hls
+++ b/tests/ref/fate/filter-hls
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x907cb7fa
 0,       1152,       1152,     1152,     2304, 0xb8dc7525
diff --git a/tests/ref/fate/filter-hls-append b/tests/ref/fate/filter-hls-append
index 52b7dff480..902571cb52 100644
--- a/tests/ref/fate/filter-hls-append
+++ b/tests/ref/fate/filter-hls-append
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x907cb7fa
 0,      26496,      26496,     1152,     2304, 0xb8dc7525
diff --git a/tests/ref/fate/filter-meta-4560-rotate0 b/tests/ref/fate/filter-meta-4560-rotate0
index 97552ffb97..0c33709b77 100644
--- a/tests/ref/fate/filter-meta-4560-rotate0
+++ b/tests/ref/fate/filter-meta-4560-rotate0
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 44100
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   195840, 0x0602351d
 1,          0,          0,     1024,     2048, 0x00000000
diff --git a/tests/ref/fate/filter-overlay-dvdsub-2397 b/tests/ref/fate/filter-overlay-dvdsub-2397
index 483e5fa4e0..7df4f50776 100644
--- a/tests/ref/fate/filter-overlay-dvdsub-2397
+++ b/tests/ref/fate/filter-overlay-dvdsub-2397
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: dts
 #sample_rate 1: 48000
-#channel_layout 1: 60f
 #channel_layout_name 1: 5.1(side)
 0,          0,          0,        1,   518400, 0x6b05d48a
 1,         27,         27,       10,     2013, 0x68e7b03a
diff --git a/tests/ref/fate/filter-pan-downmix1 b/tests/ref/fate/filter-pan-downmix1
index 47d5044dac..85630ab179 100644
--- a/tests/ref/fate/filter-pan-downmix1
+++ b/tests/ref/fate/filter-pan-downmix1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      512,     2048, 0xccb10170
 0,        512,        512,      512,     2048, 0xc51cf8e7
diff --git a/tests/ref/fate/filter-pan-downmix2 b/tests/ref/fate/filter-pan-downmix2
index 8d3ee10812..4ec18fc7dd 100644
--- a/tests/ref/fate/filter-pan-downmix2
+++ b/tests/ref/fate/filter-pan-downmix2
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 0
 #channel_layout_name 0: 5 channels
 0,          0,          0,      186,     1860, 0x2480a20e
 0,        186,        186,      186,     1860, 0xde9e9c40
diff --git a/tests/ref/fate/filter-pan-mono1 b/tests/ref/fate/filter-pan-mono1
index 3bd7c25bc1..80afee20a3 100644
--- a/tests/ref/fate/filter-pan-mono1
+++ b/tests/ref/fate/filter-pan-mono1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1024,     2048, 0x750f0a66
 0,       1024,       1024,     1024,     2048, 0x155cf063
diff --git a/tests/ref/fate/filter-pan-mono2 b/tests/ref/fate/filter-pan-mono2
index 0867ca9a13..02046aebe2 100644
--- a/tests/ref/fate/filter-pan-mono2
+++ b/tests/ref/fate/filter-pan-mono2
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 0
 #channel_layout_name 0: 1 channels
 0,          0,          0,     1024,     2048, 0x6130fb80
 0,       1024,       1024,     1024,     2048, 0xd5ef0930
diff --git a/tests/ref/fate/filter-pan-stereo1 b/tests/ref/fate/filter-pan-stereo1
index 3125d4e570..b4270bb113 100644
--- a/tests/ref/fate/filter-pan-stereo1
+++ b/tests/ref/fate/filter-pan-stereo1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      682,     2728, 0xaf365458
 0,        682,        682,      682,     2728, 0xcd684898
diff --git a/tests/ref/fate/filter-pan-stereo2 b/tests/ref/fate/filter-pan-stereo2
index 7f96799e2c..dcd429a0ce 100644
--- a/tests/ref/fate/filter-pan-stereo2
+++ b/tests/ref/fate/filter-pan-stereo2
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      682,     2728, 0x35c15e81
 0,        682,        682,      682,     2728, 0x770f2e2d
diff --git a/tests/ref/fate/filter-pan-stereo3 b/tests/ref/fate/filter-pan-stereo3
index effe11c785..726608b2bc 100644
--- a/tests/ref/fate/filter-pan-stereo3
+++ b/tests/ref/fate/filter-pan-stereo3
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xa0d1fbb3
 0,       1024,       1024,     1024,     4096, 0x598a056c
diff --git a/tests/ref/fate/filter-pan-stereo4 b/tests/ref/fate/filter-pan-stereo4
index 6d10ed62a8..92ed0685fe 100644
--- a/tests/ref/fate/filter-pan-stereo4
+++ b/tests/ref/fate/filter-pan-stereo4
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 0
 #channel_layout_name 0: 2 channels
 0,          0,          0,     1024,     4096, 0x7bd6fc44
 0,       1024,       1024,     1024,     4096, 0xed38ec37
diff --git a/tests/ref/fate/filter-pan-upmix1 b/tests/ref/fate/filter-pan-upmix1
index 87c70a7f1f..c36192c22a 100644
--- a/tests/ref/fate/filter-pan-upmix1
+++ b/tests/ref/fate/filter-pan-upmix1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 0
 #channel_layout_name 0: 4 channels
 0,          0,          0,     1024,     8192, 0xdaadfc44
 0,       1024,       1024,     1024,     8192, 0xe6d9ec37
diff --git a/tests/ref/fate/filter-pan-upmix2 b/tests/ref/fate/filter-pan-upmix2
index 56db1c17e1..1084a8f68c 100644
--- a/tests/ref/fate/filter-pan-upmix2
+++ b/tests/ref/fate/filter-pan-upmix2
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 0
 #channel_layout_name 0: 9 channels
 0,          0,          0,      512,     9216, 0xd561bb2b
 0,        512,        512,      512,     9216, 0x591805f9
diff --git a/tests/ref/fate/filter-silenceremove b/tests/ref/fate/filter-silenceremove
index 58b5a38607..26f5651672 100644
--- a/tests/ref/fate/filter-silenceremove
+++ b/tests/ref/fate/filter-silenceremove
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     8192,    16384, 0x00000000
 0,       8192,       8192,     8192,    16384, 0x00000000
diff --git a/tests/ref/fate/filter-stereotools b/tests/ref/fate/filter-stereotools
index 60acaf81b2..60a74893bd 100644
--- a/tests/ref/fate/filter-stereotools
+++ b/tests/ref/fate/filter-stereotools
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0x48b6d241
 0,       1024,       1024,     1024,     4096, 0xe0c4ca9a
diff --git a/tests/ref/fate/g722-encode b/tests/ref/fate/g722-encode
index d84d62701c..f178c8ca35 100644
--- a/tests/ref/fate/g722-encode
+++ b/tests/ref/fate/g722-encode
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     8192,    16384, 1dd9c285eb608038f3257d1a8e02eb75
diff --git a/tests/ref/fate/g722dec-1 b/tests/ref/fate/g722dec-1
index a97fc81fb0..9859984a54 100644
--- a/tests/ref/fate/g722dec-1
+++ b/tests/ref/fate/g722dec-1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     2048,     4096, 0x4f9228b3
 0,       2048,       2048,     2048,     4096, 0xfab58157
diff --git a/tests/ref/fate/g723_1-dec-1 b/tests/ref/fate/g723_1-dec-1
index f7daad1b49..e0adff2754 100644
--- a/tests/ref/fate/g723_1-dec-1
+++ b/tests/ref/fate/g723_1-dec-1
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x7f6f3970
 0,        240,        240,      240,      480, 0x1105a0d3
diff --git a/tests/ref/fate/g723_1-dec-2 b/tests/ref/fate/g723_1-dec-2
index a403e565d0..04c1ca7385 100644
--- a/tests/ref/fate/g723_1-dec-2
+++ b/tests/ref/fate/g723_1-dec-2
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x5d9d9091
 0,        240,        240,      240,      480, 0x425095b7
diff --git a/tests/ref/fate/g723_1-dec-3 b/tests/ref/fate/g723_1-dec-3
index e3d3978138..f4a95d13ce 100644
--- a/tests/ref/fate/g723_1-dec-3
+++ b/tests/ref/fate/g723_1-dec-3
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xce908869
 0,        240,        240,      240,      480, 0xfa63588e
diff --git a/tests/ref/fate/g723_1-dec-4 b/tests/ref/fate/g723_1-dec-4
index 309b3afea5..7b092dca16 100644
--- a/tests/ref/fate/g723_1-dec-4
+++ b/tests/ref/fate/g723_1-dec-4
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xa697b314
 0,        240,        240,      240,      480, 0x43c5dc5a
diff --git a/tests/ref/fate/g723_1-dec-5 b/tests/ref/fate/g723_1-dec-5
index 9e37c861a2..9e0b6e4cd5 100644
--- a/tests/ref/fate/g723_1-dec-5
+++ b/tests/ref/fate/g723_1-dec-5
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x4dce9773
 0,        240,        240,      240,      480, 0xe6367ab8
diff --git a/tests/ref/fate/g723_1-dec-6 b/tests/ref/fate/g723_1-dec-6
index a51e8df9c8..f0e67b14db 100644
--- a/tests/ref/fate/g723_1-dec-6
+++ b/tests/ref/fate/g723_1-dec-6
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x4fa1aed9
 0,        240,        240,      240,      480, 0x6d7ef391
diff --git a/tests/ref/fate/g723_1-dec-7 b/tests/ref/fate/g723_1-dec-7
index db0ceb85ef..34be011d8e 100644
--- a/tests/ref/fate/g723_1-dec-7
+++ b/tests/ref/fate/g723_1-dec-7
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x35e4a1fd
 0,        240,        240,      240,      480, 0x2f7bdd60
diff --git a/tests/ref/fate/g723_1-dec-8 b/tests/ref/fate/g723_1-dec-8
index 740ed2b4c7..80ad39498a 100644
--- a/tests/ref/fate/g723_1-dec-8
+++ b/tests/ref/fate/g723_1-dec-8
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x17930e0f
 0,        240,        240,      240,      480, 0x7c7f4247
diff --git a/tests/ref/fate/g726-encode-2bit b/tests/ref/fate/g726-encode-2bit
index 4a83c95760..2aafcc8bf2 100644
--- a/tests/ref/fate/g726-encode-2bit
+++ b/tests/ref/fate/g726-encode-2bit
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,    16384,    32768, b28b116d2315323aeba6b66b58b7f4ed
diff --git a/tests/ref/fate/g726-encode-3bit b/tests/ref/fate/g726-encode-3bit
index c551ae608f..96c6b9447b 100644
--- a/tests/ref/fate/g726-encode-3bit
+++ b/tests/ref/fate/g726-encode-3bit
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,    10920,    21840, 517dd6d1ce566b998251f0d215fa69c0
diff --git a/tests/ref/fate/g726-encode-4bit b/tests/ref/fate/g726-encode-4bit
index ea277e12c5..28e9ee0284 100644
--- a/tests/ref/fate/g726-encode-4bit
+++ b/tests/ref/fate/g726-encode-4bit
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     8192,    16384, a0cf3a0953adce1a1032a4fd2da00a52
diff --git a/tests/ref/fate/g726-encode-5bit b/tests/ref/fate/g726-encode-5bit
index 30c456e864..c7cd7dd1d9 100644
--- a/tests/ref/fate/g726-encode-5bit
+++ b/tests/ref/fate/g726-encode-5bit
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,     6552,    13104, 6fe3f75df1262c5f956887de9c32df40
diff --git a/tests/ref/fate/gapless-mp3 b/tests/ref/fate/gapless-mp3
index 0b4937792a..578db55534 100644
--- a/tests/ref/fate/gapless-mp3
+++ b/tests/ref/fate/gapless-mp3
@@ -1,5 +1,5 @@ 
-77ef234e382c15b8afc416ca9c80024b *tests/data/fate/gapless-mp3.out-1
+d7e884aea266b63f1547f1ad10188c08 *tests/data/fate/gapless-mp3.out-1
 c96c3ae7bd3300fd2f4debac222de5b7
-c594be833fb94ae91f2734bcba56c359 *tests/data/fate/gapless-mp3.out-2
+75bc539914297a191f40af2d737d7380 *tests/data/fate/gapless-mp3.out-2
 c96c3ae7bd3300fd2f4debac222de5b7
-5a285806cad6524a3d6184775e097d24 *tests/data/fate/gapless-mp3.out-3
+ab21e0bd0c2d84426153d4cde919a1e3 *tests/data/fate/gapless-mp3.out-3
diff --git a/tests/ref/fate/gsm-ms b/tests/ref/fate/gsm-ms
index 0acf9f6e69..a7bebac0fe 100644
--- a/tests/ref/fate/gsm-ms
+++ b/tests/ref/fate/gsm-ms
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      320,      640, 0xf79c59ee
 0,        320,        320,      320,      640, 0x6e6248be
diff --git a/tests/ref/fate/gsm-toast b/tests/ref/fate/gsm-toast
index df5e824408..6b272433de 100644
--- a/tests/ref/fate/gsm-toast
+++ b/tests/ref/fate/gsm-toast
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,       64,      128, 0x3ef33f6f
 0,         64,         64,      160,      320, 0x2052a4e7
diff --git a/tests/ref/fate/h264-skip-nointra b/tests/ref/fate/h264-skip-nointra
index 0259902927..82977ce674 100644
--- a/tests/ref/fate/h264-skip-nointra
+++ b/tests/ref/fate/h264-skip-nointra
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 1,          0,          0,     1152,     4608, 0x00000000
 1,       1152,       1152,     1152,     4608, 0x00000000
diff --git a/tests/ref/fate/h264-skip-nokey b/tests/ref/fate/h264-skip-nokey
index 0259902927..82977ce674 100644
--- a/tests/ref/fate/h264-skip-nokey
+++ b/tests/ref/fate/h264-skip-nokey
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 1,          0,          0,     1152,     4608, 0x00000000
 1,       1152,       1152,     1152,     4608, 0x00000000
diff --git a/tests/ref/fate/h264-xavc-4389 b/tests/ref/fate/h264-xavc-4389
index 5c76bc222f..b8d957d963 100644
--- a/tests/ref/fate/h264-xavc-4389
+++ b/tests/ref/fate/h264-xavc-4389
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,  8294400, 0x9a02ecf2
 1,          0,          0,     1920,     3840, 0x38074ac8
diff --git a/tests/ref/fate/hls-fmp4 b/tests/ref/fate/hls-fmp4
index 98b037fc8f..df11c55540 100644
--- a/tests/ref/fate/hls-fmp4
+++ b/tests/ref/fate/hls-fmp4
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x907cb7fa
 0,       1152,       1152,     1152,     2304, 0xb8dc7525
diff --git a/tests/ref/fate/hls-init-time b/tests/ref/fate/hls-init-time
index 5bc12272cc..f1c62d551f 100644
--- a/tests/ref/fate/hls-init-time
+++ b/tests/ref/fate/hls-init-time
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x28123557
 0,       1152,       1152,     1152,     2304, 0x838c7e81
diff --git a/tests/ref/fate/hls-list-size b/tests/ref/fate/hls-list-size
index cf7fb9fe3a..2dd6ef8426 100644
--- a/tests/ref/fate/hls-list-size
+++ b/tests/ref/fate/hls-list-size
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x9ce3278a
 0,       1152,       1152,     1152,     2304, 0x5cd17b17
diff --git a/tests/ref/fate/hls-segment-single b/tests/ref/fate/hls-segment-single
index ee3c7b2c62..ed0ecc8e76 100644
--- a/tests/ref/fate/hls-segment-single
+++ b/tests/ref/fate/hls-segment-single
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x907cb7fa
 0,       1152,       1152,     1152,     2304, 0xb8dc7525
diff --git a/tests/ref/fate/hls-segment-size b/tests/ref/fate/hls-segment-size
index ee3c7b2c62..ed0ecc8e76 100644
--- a/tests/ref/fate/hls-segment-size
+++ b/tests/ref/fate/hls-segment-size
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1152,     2304, 0x907cb7fa
 0,       1152,       1152,     1152,     2304, 0xb8dc7525
diff --git a/tests/ref/fate/id-cin-video b/tests/ref/fate/id-cin-video
index 671b396a11..e3da4aa071 100644
--- a/tests/ref/fate/id-cin-video
+++ b/tests/ref/fate/id-cin-video
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22050
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,   230400, 0x00000000
 1,          0,          0,     1575,     6300, 0xdd759df8
diff --git a/tests/ref/fate/id3v2-chapters b/tests/ref/fate/id3v2-chapters
index 5aa8f82af9..c845e88821 100644
--- a/tests/ref/fate/id3v2-chapters
+++ b/tests/ref/fate/id3v2-chapters
@@ -4,7 +4,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,     4096, 0xc5b6547b
 0,       1024,       1024,     1024,     4096, 0x0f27633e
diff --git a/tests/ref/fate/id3v2-priv-remux b/tests/ref/fate/id3v2-priv-remux
index a30f68a256..a0f370142e 100644
--- a/tests/ref/fate/id3v2-priv-remux
+++ b/tests/ref/fate/id3v2-priv-remux
@@ -4,7 +4,6 @@  bb2816e3a05ce136e9ac14479c1ebe24 *tests/data/fate/id3v2-priv-remux.mp3
 #media_type 0: audio
 #codec_id 0: mp3
 #sample_rate 0: 48000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,    -155528,    -155528,   338688,      192, 0x3774510e, S=1,       10
 0,     183160,     183160,   338688,      192, 0x856c5b02
diff --git a/tests/ref/fate/jv-demux b/tests/ref/fate/jv-demux
index bf8211074c..b5d3196cf5 100644
--- a/tests/ref/fate/jv-demux
+++ b/tests/ref/fate/jv-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_u8
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,        6, 0x000a0003
 1,          0,          0,   131072,   131072, 0x14c664d6
diff --git a/tests/ref/fate/lmlm4-demux b/tests/ref/fate/lmlm4-demux
index b0276d53e9..9bddf58408 100644
--- a/tests/ref/fate/lmlm4-demux
+++ b/tests/ref/fate/lmlm4-demux
@@ -8,7 +8,6 @@ 
 #media_type 1: audio
 #codec_id 1: mp2
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0, -9223372036854775808,        1,     5951, 0xe9118e0d
 1,          0,          0,     2160,      768, 0xaebcbebb
diff --git a/tests/ref/fate/matroska-flac-channel-mapping b/tests/ref/fate/matroska-flac-channel-mapping
index 6d901600e5..25627d6570 100644
--- a/tests/ref/fate/matroska-flac-channel-mapping
+++ b/tests/ref/fate/matroska-flac-channel-mapping
@@ -4,13 +4,11 @@ 
 #media_type 0: audio
 #codec_id 0: flac
 #sample_rate 0: 48000
-#channel_layout 0: 3f
 #channel_layout_name 0: 5.1
 #tb 1: 651/31250000
 #media_type 1: audio
 #codec_id 1: flac
 #sample_rate 1: 48000
-#channel_layout 1: 60f
 #channel_layout_name 1: 5.1(side)
 0,          0,          0,     4096,       26, 0x50f80431
 1,          0,          0,     4096,       26, 0x50f80431
diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update
index 1a8add7736..42d550b580 100644
--- a/tests/ref/fate/matroska-flac-extradata-update
+++ b/tests/ref/fate/matroska-flac-extradata-update
@@ -7,19 +7,16 @@  c2b76d47a9f0e9626a4999bd395cae08 *tests/data/fate/matroska-flac-extradata-update
 #media_type 0: audio
 #codec_id 0: flac
 #sample_rate 0: 48000
-#channel_layout 0: 3f
 #channel_layout_name 0: 5.1
 #tb 1: 1/1000
 #media_type 1: audio
 #codec_id 1: flac
 #sample_rate 1: 48000
-#channel_layout 1: 60f
 #channel_layout_name 1: 5.1(side)
 #tb 2: 1/1000
 #media_type 2: audio
 #codec_id 2: flac
 #sample_rate 2: 48000
-#channel_layout 2: 3f
 #channel_layout_name 2: 5.1
 0,          0,          0,       96,       26, 0x4e160341
 1,          0,          0,       96,       26, 0x4e160341
diff --git a/tests/ref/fate/matroska-lzo-decompression b/tests/ref/fate/matroska-lzo-decompression
index 241d5adf44..568e32eccc 100644
--- a/tests/ref/fate/matroska-lzo-decompression
+++ b/tests/ref/fate/matroska-lzo-decompression
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     4096,    16384, 0x00000000
 0,       4096,       4096,     4096,    16384, 0xad7eebf4
diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata
index 8f5d7b6a22..1701f81281 100644
--- a/tests/ref/fate/matroska-mastering-display-metadata
+++ b/tests/ref/fate/matroska-mastering-display-metadata
@@ -11,13 +11,11 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s24le
 #sample_rate 1: 48000
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 #tb 2: 1/1000
 #media_type 2: audio
 #codec_id 2: pcm_s16be
 #sample_rate 2: 48000
-#channel_layout 2: 4
 #channel_layout_name 2: mono
 #tb 3: 1/1000
 #media_type 3: video
diff --git a/tests/ref/fate/matroska-mpegts-remux b/tests/ref/fate/matroska-mpegts-remux
index 9478294b8e..148bc0ffbc 100644
--- a/tests/ref/fate/matroska-mpegts-remux
+++ b/tests/ref/fate/matroska-mpegts-remux
@@ -4,13 +4,11 @@ 
 #media_type 0: audio
 #codec_id 0: ac3
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #tb 1: 1/1000
 #media_type 1: audio
 #codec_id 1: ac3
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,       32,      768, 0xa63778d4
 1,          0,          0,       32,      768, 0xa63778d4
diff --git a/tests/ref/fate/matroska-wavpack-missing-codecprivate b/tests/ref/fate/matroska-wavpack-missing-codecprivate
index 4645a86ff6..2a91f1c9ca 100644
--- a/tests/ref/fate/matroska-wavpack-missing-codecprivate
+++ b/tests/ref/fate/matroska-wavpack-missing-codecprivate
@@ -3,7 +3,6 @@ 
 #media_type 0: audio
 #codec_id 0: wavpack
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,    22051,    14778, 0x02819286
 0,      22051,      22051,    22052,    14756, 0x21976243
diff --git a/tests/ref/fate/matroska-xiph-lacing b/tests/ref/fate/matroska-xiph-lacing
index c74cf9900d..dd00f21e93 100644
--- a/tests/ref/fate/matroska-xiph-lacing
+++ b/tests/ref/fate/matroska-xiph-lacing
@@ -3,7 +3,6 @@ 
 #media_type 0: audio
 #codec_id 0: vorbis
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      128,       84, 0x1beb2cc9
 0,        128,        128,      576,      533, 0xa5d425e9
diff --git a/tests/ref/fate/maxis-xa b/tests/ref/fate/maxis-xa
index ad9d73278b..120ec9e603 100644
--- a/tests/ref/fate/maxis-xa
+++ b/tests/ref/fate/maxis-xa
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: adpcm_ea_maxis_xa
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,       28,       30, 0x51750711
 0,         28,         28,       28,       30, 0x9ca20c2a
diff --git a/tests/ref/fate/mkv b/tests/ref/fate/mkv
index f9c3037f09..d3dfef76b1 100644
--- a/tests/ref/fate/mkv
+++ b/tests/ref/fate/mkv
@@ -9,7 +9,6 @@ 
 #media_type 1: audio
 #codec_id 1: aac
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,        -42,          0,       41,    63501, 0x139d4c99
 0,          0,         84,       41,     5368, 0xd964b678, F=0x0
diff --git a/tests/ref/fate/mkv-1242 b/tests/ref/fate/mkv-1242
index 34e5b4aa9c..e025701093 100644
--- a/tests/ref/fate/mkv-1242
+++ b/tests/ref/fate/mkv-1242
@@ -9,7 +9,6 @@ 
 #media_type 1: audio
 #codec_id 1: aac
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,        -42,          0,       41,     2969, 0xa7016742
 0,          0,         42,       41,      135, 0x33af1a9e, F=0x0
diff --git a/tests/ref/fate/mov-440hz-10ms b/tests/ref/fate/mov-440hz-10ms
index 498879e52d..77b50d262c 100644
--- a/tests/ref/fate/mov-440hz-10ms
+++ b/tests/ref/fate/mov-440hz-10ms
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,      960,     1920, 44e7e48ff08835ce30e93c7971dae7df
diff --git a/tests/ref/fate/mov-bbi-elst-starts-b b/tests/ref/fate/mov-bbi-elst-starts-b
index 3ba28b5e75..f6c2c56eb2 100644
--- a/tests/ref/fate/mov-bbi-elst-starts-b
+++ b/tests/ref/fate/mov-bbi-elst-starts-b
@@ -10,7 +10,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 #stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,  3110400, e9454409af76038dbe56e834921d2fa8
diff --git a/tests/ref/fate/mov-cover-image b/tests/ref/fate/mov-cover-image
index 6141646afa..5f65c630ea 100644
--- a/tests/ref/fate/mov-cover-image
+++ b/tests/ref/fate/mov-cover-image
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #tb 1: 1/90000
 #media_type 1: video
diff --git a/tests/ref/fate/mov-mp3-demux b/tests/ref/fate/mov-mp3-demux
index 1930960640..77ec4acedf 100644
--- a/tests/ref/fate/mov-mp3-demux
+++ b/tests/ref/fate/mov-mp3-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: mp3
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1152,       36, 0x8e260589
 0,       1152,       1152,     1152,       36, 0x8e260589
diff --git a/tests/ref/fate/mov-mp4-disposition-mpegts-remux b/tests/ref/fate/mov-mp4-disposition-mpegts-remux
index 184b952e04..efef043074 100644
--- a/tests/ref/fate/mov-mp4-disposition-mpegts-remux
+++ b/tests/ref/fate/mov-mp4-disposition-mpegts-remux
@@ -4,13 +4,11 @@  adb3b95c07a5f3e0c86641dd62f01dae *tests/data/fate/mov-mp4-disposition-mpegts-rem
 #media_type 0: audio
 #codec_id 0: ac3
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 #tb 1: 1/48000
 #media_type 1: audio
 #codec_id 1: ac3
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 1,          0,          0,     1536,      768, 0xa63778d4, S=1,        4
 1,       1536,       1536,     1536,      768, 0x7d577f3f
diff --git a/tests/ref/fate/mpegps-remuxed-pcm-demux b/tests/ref/fate/mpegps-remuxed-pcm-demux
index b5b277868f..20173d3a44 100644
--- a/tests/ref/fate/mpegps-remuxed-pcm-demux
+++ b/tests/ref/fate/mpegps-remuxed-pcm-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_dvd
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     2040,     2005, 0x8e98e563
 0,       2090,       2090,     2069,     2033, 0xd6f2f455
diff --git a/tests/ref/fate/mtv b/tests/ref/fate/mtv
index 7b17bc1b6c..a4647a39ac 100644
--- a/tests/ref/fate/mtv
+++ b/tests/ref/fate/mtv
@@ -8,7 +8,6 @@ 
 #media_type 1: audio
 #codec_id 1: mp3
 #sample_rate 1: 44100
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,    12288, 0xc2258ebc
 1,          0,          0,     1152,      417, 0xae1cc66a
diff --git a/tests/ref/fate/mxf-demux b/tests/ref/fate/mxf-demux
index 906a6d0638..3010ca2177 100644
--- a/tests/ref/fate/mxf-demux
+++ b/tests/ref/fate/mxf-demux
@@ -8,7 +8,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_alaw
 #sample_rate 1: 8000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0, -9223372036854775808,        1,     8468, 0xc0855553
 1,          0,          0,    16000,    32000, 0x479155e6
diff --git a/tests/ref/fate/nsv-demux b/tests/ref/fate/nsv-demux
index bff871dabe..540079ad44 100644
--- a/tests/ref/fate/nsv-demux
+++ b/tests/ref/fate/nsv-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: mp3
 #sample_rate 1: 11025
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,       12, 0x1396035f
 0,          1,          1,        1,       24, 0x8ab80ac7, F=0x0
diff --git a/tests/ref/fate/oma-atrac3-remux b/tests/ref/fate/oma-atrac3-remux
index fb402c43c6..d807c6cfb0 100644
--- a/tests/ref/fate/oma-atrac3-remux
+++ b/tests/ref/fate/oma-atrac3-remux
@@ -5,7 +5,6 @@ 
 #media_type 0: audio
 #codec_id 0: atrac3
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1024,      384, 0xdfded1b5
 0,       1024,       1024,     1024,      384, 0xd8e3badd
diff --git a/tests/ref/fate/oma-atrac3p-remux b/tests/ref/fate/oma-atrac3p-remux
index d909fdaee9..7d1cd962e5 100644
--- a/tests/ref/fate/oma-atrac3p-remux
+++ b/tests/ref/fate/oma-atrac3p-remux
@@ -4,7 +4,6 @@ 
 #media_type 0: audio
 #codec_id 0: atrac3p
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     2048,     1488, 0x69b7fad9
 0,       2048,       2048,     2048,     1488, 0x3c43fdb8
diff --git a/tests/ref/fate/on2avc b/tests/ref/fate/on2avc
index a9d6cbcea9..2475c1498a 100644
--- a/tests/ref/fate/on2avc
+++ b/tests/ref/fate/on2avc
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1024,     2048, 0x00000000
 0,       1024,       1024,     1024,     2048, 0x96ee1301
diff --git a/tests/ref/fate/paf-audio b/tests/ref/fate/paf-audio
index a9ed9e99fe..b2fbc094eb 100644
--- a/tests/ref/fate/paf-audio
+++ b/tests/ref/fate/paf-audio
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,    57330,   229320, 0x062508b4
 0,      57330,      57330,    57330,   229320, 0x0a966cbf
diff --git a/tests/ref/fate/paf-demux b/tests/ref/fate/paf-demux
index 6a66697af8..a0d1f44843 100644
--- a/tests/ref/fate/paf-demux
+++ b/tests/ref/fate/paf-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: paf_audio
 #sample_rate 1: 22050
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,   262144, 0x7f9a3c6a
 1,          0,          0,    57330,   131072, 0x255a6ac2
diff --git a/tests/ref/fate/pcm-planar b/tests/ref/fate/pcm-planar
index 8b6c96181a..b1d988bb75 100644
--- a/tests/ref/fate/pcm-planar
+++ b/tests/ref/fate/pcm-planar
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1471,     5884, 0x00000000
 0,       1471,       1471,     1471,     5884, 0x00000000
diff --git a/tests/ref/fate/pcm_dvd b/tests/ref/fate/pcm_dvd
index 2a24156284..61ddcaef17 100644
--- a/tests/ref/fate/pcm_dvd
+++ b/tests/ref/fate/pcm_dvd
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 48000
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,      334,     1336, 0x8e3c0abc
 0,        400,        400,      334,     1336, 0x99c41108
diff --git a/tests/ref/fate/pmp-demux b/tests/ref/fate/pmp-demux
index 5c51b8b453..90475e398d 100644
--- a/tests/ref/fate/pmp-demux
+++ b/tests/ref/fate/pmp-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: mp3
 #sample_rate 0: 44100
-#channel_layout 0: 3
 #channel_layout_name 0: stereo
 0,          0,          0,     1152,      417, 0xcb873fba
 0,       1152,       1152,     1152,      104, 0x6d521c5a
diff --git a/tests/ref/fate/prores-gray b/tests/ref/fate/prores-gray
index a1a63fa945..08fcf2473d 100644
--- a/tests/ref/fate/prores-gray
+++ b/tests/ref/fate/prores-gray
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,  1658880, 0x43d9c9e2
 1,          0,          0,     1024,     4096, 0x6c8a9a18
diff --git a/tests/ref/fate/prores-transparency b/tests/ref/fate/prores-transparency
index 4e88152834..246e0b26aa 100644
--- a/tests/ref/fate/prores-transparency
+++ b/tests/ref/fate/prores-transparency
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1, 16588800, 0xcfb3d806
 1,          0,          0,     1024,     4096, 0x00000000
diff --git a/tests/ref/fate/prores-transparency_skip b/tests/ref/fate/prores-transparency_skip
index 82c180d174..3f5fa0a13f 100644
--- a/tests/ref/fate/prores-transparency_skip
+++ b/tests/ref/fate/prores-transparency_skip
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1, 12441600, 0x74f53304
 1,          0,          0,     1024,     4096, 0x00000000
diff --git a/tests/ref/fate/psx-str-demux b/tests/ref/fate/psx-str-demux
index a47c86952f..18a21b0bb6 100644
--- a/tests/ref/fate/psx-str-demux
+++ b/tests/ref/fate/psx-str-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: adpcm_xa
 #sample_rate 1: 37800
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        1,     8832, 0x01ad3eeb
 1,          0,          0,        1,     2304, 0xf0ad1000
diff --git a/tests/ref/fate/pva-demux b/tests/ref/fate/pva-demux
index 3f1c74f366..5c0e1c1ea0 100644
--- a/tests/ref/fate/pva-demux
+++ b/tests/ref/fate/pva-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: mp2
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 1,          0,          0,     2160,      384, 0x071abcc8
 1,       2160,       2160,     2160,      384, 0x31c9aee0
diff --git a/tests/ref/fate/ra3-144 b/tests/ref/fate/ra3-144
index 75e7bbfc7a..3068227cb9 100644
--- a/tests/ref/fate/ra3-144
+++ b/tests/ref/fate/ra3-144
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 8000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,      160,      320, 0x00000000
 0,        160,        160,      160,      320, 0x4cfd5d74
diff --git a/tests/ref/fate/redcode-demux b/tests/ref/fate/redcode-demux
index 45119ec71e..4815a8b8c7 100644
--- a/tests/ref/fate/redcode-demux
+++ b/tests/ref/fate/redcode-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s32be
 #sample_rate 1: 48000
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,    10010,  1626280, 0x5768c7d6
 1,          0,          0,    18140,    14816, 0xd185e8c7
diff --git a/tests/ref/fate/s337m-demux b/tests/ref/fate/s337m-demux
index 2857c65aee..42ef4df275 100644
--- a/tests/ref/fate/s337m-demux
+++ b/tests/ref/fate/s337m-demux
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: dolby_e
 #sample_rate 0: 44800
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 0,          0,          0,     3600,     7664, 0x7e73f2fd
 0,       3600,       3600,     3600,     7664, 0x8b980ec8
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-000 b/tests/ref/fate/segment-adts-to-mkv-header-000
index 294aa2346f..91729811fc 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-000
+++ b/tests/ref/fate/segment-adts-to-mkv-header-000
@@ -3,7 +3,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,       64,        4, 0x02f70117
 0,         64,         64,       64,      163, 0xd5f85007
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-001 b/tests/ref/fate/segment-adts-to-mkv-header-001
index ec4669f12c..e24282e3e4 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-001
+++ b/tests/ref/fate/segment-adts-to-mkv-header-001
@@ -3,7 +3,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,       64,      153, 0xbb6e432f
 0,         64,         64,       64,      185, 0xa01f4ff3
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-002 b/tests/ref/fate/segment-adts-to-mkv-header-002
index 06df824565..fc42d8ad00 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-002
+++ b/tests/ref/fate/segment-adts-to-mkv-header-002
@@ -3,7 +3,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,       64,      156, 0x867d4f3a
 0,         64,         64,       64,      201, 0x62745ff9
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-all b/tests/ref/fate/segment-adts-to-mkv-header-all
index 9c78d33477..dd2ec9a99e 100644
--- a/tests/ref/fate/segment-adts-to-mkv-header-all
+++ b/tests/ref/fate/segment-adts-to-mkv-header-all
@@ -3,7 +3,6 @@ 
 #media_type 0: audio
 #codec_id 0: aac
 #sample_rate 0: 16000
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,       64,        4, 0x02f70117
 0,         64,         64,       64,      163, 0xd5f85007
diff --git a/tests/ref/fate/shortest b/tests/ref/fate/shortest
index 64b5bed312..a527bfd544 100644
--- a/tests/ref/fate/shortest
+++ b/tests/ref/fate/shortest
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: ac3
 #sample_rate 1: 44100
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 1,       -256,       -256,     1536,      416, 0xef8ccbe3
 0,          0,          0,        1,     8749, 0x57039d10, S=1,        8
diff --git a/tests/ref/fate/sierra-vmd-audio b/tests/ref/fate/sierra-vmd-audio
index 9c0e6b2db1..7bed6e64ae 100644
--- a/tests/ref/fate/sierra-vmd-audio
+++ b/tests/ref/fate/sierra-vmd-audio
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,    61740,   123480, 0x3a794c13
 0,      61740,      61740,     2205,     4410, 0x109d04e0
diff --git a/tests/ref/fate/siff-demux b/tests/ref/fate/siff-demux
index f8e9897931..a6d47cee66 100644
--- a/tests/ref/fate/siff-demux
+++ b/tests/ref/fate/siff-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_u8
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,    15152, 0x14fc0f1f
 1,          0,          0,    22050,    22050, 0xa7d60d27
diff --git a/tests/ref/fate/smacker-audio b/tests/ref/fate/smacker-audio
index 6b867874d9..4703501bcb 100644
--- a/tests/ref/fate/smacker-audio
+++ b/tests/ref/fate/smacker-audio
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: pcm_s16le
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,    23620,    47240, 0x9974897c
 0,      23620,      23620,     1564,     3128, 0x7e4064b4
diff --git a/tests/ref/fate/smjpeg-demux b/tests/ref/fate/smjpeg-demux
index cb2da6909d..e394f3839e 100644
--- a/tests/ref/fate/smjpeg-demux
+++ b/tests/ref/fate/smjpeg-demux
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: adpcm_ima_smjpeg
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,      111,      734, 0x5a042c2c
 1,          0,          0,       23,      260, 0x00000000
diff --git a/tests/ref/fate/sp5x b/tests/ref/fate/sp5x
index 2ca79815ee..6b8fbfc3d8 100644
--- a/tests/ref/fate/sp5x
+++ b/tests/ref/fate/sp5x
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 8000
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   115200, 0x8ebcb7f8
 1,          0,          0,     1024,     2048, 0x366ee71c
diff --git a/tests/ref/fate/tiertex-seq b/tests/ref/fate/tiertex-seq
index 1db906ad33..8bd0b50539 100644
--- a/tests/ref/fate/tiertex-seq
+++ b/tests/ref/fate/tiertex-seq
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 1,          0,          0,      882,     1764, 0x00000000
 1,        882,        882,      882,     1764, 0x80a253d9
diff --git a/tests/ref/fate/tmv b/tests/ref/fate/tmv
index 09198fab2b..ccfaa0d980 100644
--- a/tests/ref/fate/tmv
+++ b/tests/ref/fate/tmv
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22058
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   192000, 0xc698297a
 1,          0,          0,      368,      736, 0xf63db497
diff --git a/tests/ref/fate/tscc-15bit b/tests/ref/fate/tscc-15bit
index ded8ad43e0..be81d891e2 100644
--- a/tests/ref/fate/tscc-15bit
+++ b/tests/ref/fate/tscc-15bit
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 11025
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   657600, 0x50b3a0c2
 1,          0,          0,    11025,    22050, 0x1740aaec
diff --git a/tests/ref/fate/vqf-demux b/tests/ref/fate/vqf-demux
index d768ddbb69..2669d8cc18 100644
--- a/tests/ref/fate/vqf-demux
+++ b/tests/ref/fate/vqf-demux
@@ -1 +1 @@ 
-5f4cd9a6a8bea0040db6732a7830e9d7
+e42a45601a4a7c39436907c5cdfde5ee
diff --git a/tests/ref/fate/wav-ac3 b/tests/ref/fate/wav-ac3
index 039e155daf..b20403e612 100644
--- a/tests/ref/fate/wav-ac3
+++ b/tests/ref/fate/wav-ac3
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: ac3
 #sample_rate 0: 44100
-#channel_layout 0: 60f
 #channel_layout_name 0: 5.1(side)
 0,          0,          0,     1536,     2786, 0xe2fd0f40
 0,       1536,       1536,     1536,     2786, 0x7a6207c2
diff --git a/tests/ref/fate/wc3movie-xan b/tests/ref/fate/wc3movie-xan
index 052dbbce7d..4acb0a3b59 100644
--- a/tests/ref/fate/wc3movie-xan
+++ b/tests/ref/fate/wc3movie-xan
@@ -7,7 +7,6 @@ 
 #media_type 1: audio
 #codec_id 1: pcm_s16le
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        1,   158400, 0x25aec781
 1,          0,          0,     1470,     2940, 0x92cee2a6
diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters
index c04fc6a3ee..33ba3c7bf3 100644
--- a/tests/ref/fate/webm-dash-chapters
+++ b/tests/ref/fate/webm-dash-chapters
@@ -5,7 +5,6 @@  c39ad75ef516d1d2e1332d960ad1057b *tests/data/fate/webm-dash-chapters.webm
 #media_type 0: audio
 #codec_id 0: vorbis
 #sample_rate 0: 44100
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,        5,       28, 0xefcf103e
 0,          6,          6,       26,      198, 0xfbbe5eb5
diff --git a/tests/ref/fate/westwood-aud b/tests/ref/fate/westwood-aud
index b719c50a4d..cc9d1f0460 100644
--- a/tests/ref/fate/westwood-aud
+++ b/tests/ref/fate/westwood-aud
@@ -2,7 +2,6 @@ 
 #media_type 0: audio
 #codec_id 0: adpcm_ima_ws
 #sample_rate 0: 22050
-#channel_layout 0: 4
 #channel_layout_name 0: mono
 0,          0,          0,     1024,      512, 0x6694cc55
 0,       1024,       1024,     1024,      512, 0xdbc5cb22
diff --git a/tests/ref/fate/wmv3-drm-nodec b/tests/ref/fate/wmv3-drm-nodec
index a46c338d54..9ed8bc8575 100644
--- a/tests/ref/fate/wmv3-drm-nodec
+++ b/tests/ref/fate/wmv3-drm-nodec
@@ -9,7 +9,6 @@ 
 #media_type 1: audio
 #codec_id 1: wmavoice
 #sample_rate 1: 22050
-#channel_layout 1: 4
 #channel_layout_name 1: mono
 0,          0,          0,        0,      282, 0x000d949a
 1,          0,          0,        0,     1088, 0x5cd379bb
diff --git a/tests/ref/fate/wtv-demux b/tests/ref/fate/wtv-demux
index abe85a4ab6..5d1a02fc6e 100644
--- a/tests/ref/fate/wtv-demux
+++ b/tests/ref/fate/wtv-demux
@@ -9,7 +9,6 @@ 
 #media_type 1: audio
 #codec_id 1: mp2
 #sample_rate 1: 48000
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 1,         -2,         -2,   240000,      576, 0x9b6e1638
 1,     239998,     239998,   240000,      576, 0x0ca91183
diff --git a/tests/ref/fate/xmv-demux b/tests/ref/fate/xmv-demux
index 6da2b1a701..9cc26e41c3 100644
--- a/tests/ref/fate/xmv-demux
+++ b/tests/ref/fate/xmv-demux
@@ -8,7 +8,6 @@ 
 #media_type 1: audio
 #codec_id 1: adpcm_ima_wav
 #sample_rate 1: 44100
-#channel_layout 1: 3
 #channel_layout_name 1: stereo
 0,          0,          0,        0,     1508, 0xefceba48
 1,          0,          0,       83,     5976, 0xfa2c2db9