aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-11-10 22:53:29 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-11 15:04:21 +0100
commit46070cc20aa341d385136ec767b127a956f7d9ba (patch)
tree3309c3df45c6e7a10a1e2d3a5b28c28d93f6051e
parent9ffc61b1256e42c54766e73fd899a57261eb9b3b (diff)
downloadffmpeg-46070cc20aa341d385136ec767b127a956f7d9ba.tar.gz
ffmpeg: set muxer packet duration based on framerate only for CFR
a set ost->frame_rate does not imply CFR in ffmpeg The changed fate tests had all wrong packet durations (like 1/1000 or 1/90000) There might be more cases in which is_cfr could be set Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat
-rw-r--r--ffmpeg.c3
-rw-r--r--ffmpeg.h1
-rw-r--r--tests/ref/fate/g2m2320
-rw-r--r--tests/ref/fate/iff-byterun12
-rw-r--r--tests/ref/fate/iff-ilbm2
-rw-r--r--tests/ref/fate/mimic152
-rw-r--r--tests/ref/fate/mss2-pal4
-rw-r--r--tests/ref/fate/mss2-pals4
-rw-r--r--tests/ref/fate/mss2-rgb5554
-rw-r--r--tests/ref/fate/mss2-rgb555s4
-rw-r--r--tests/ref/fate/vp9-tiling-pedestrian4
11 files changed, 251 insertions, 249 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 7f3c426e09..ae78270023 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -672,7 +672,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
ost->error[i] = -1;
}
- if (ost->frame_rate.num) {
+ if (ost->frame_rate.num && ost->is_cfr) {
pkt->duration = av_rescale_q(1, av_inv_q(ost->frame_rate),
ost->st->time_base);
}
@@ -1005,6 +1005,7 @@ static void do_video_out(AVFormatContext *s,
format_video_sync = VSYNC_VSCFR;
}
}
+ ost->is_cfr = (format_video_sync == VSYNC_CFR || format_video_sync == VSYNC_VSCFR);
if (delta0 < 0 &&
delta > 0 &&
diff --git a/ffmpeg.h b/ffmpeg.h
index cdcb3b46fa..39b9edab52 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -421,6 +421,7 @@ typedef struct OutputStream {
/* video only */
AVRational frame_rate;
+ int is_cfr;
int force_fps;
int top_field_first;
int rotate_overridden;
diff --git a/tests/ref/fate/g2m2 b/tests/ref/fate/g2m2
index e42276ac92..710dbd145f 100644
--- a/tests/ref/fate/g2m2
+++ b/tests/ref/fate/g2m2
@@ -1,161 +1,161 @@
#tb 0: 1/1000
-0, 47, 47, 1, 2359296, 0xb4434e4f
-0, 62, 62, 1, 2359296, 0x59cb5027
-0, 78, 78, 1, 2359296, 0xe9bc578d
-0, 109, 109, 1, 2359296, 0x5d17554f
-0, 125, 125, 1, 2359296, 0x6d685457
-0, 437, 437, 1, 2359296, 0x13205420
-0, 438, 438, 1, 2359296, 0xb8e15116
-0, 453, 453, 1, 2359296, 0x2ca55195
-0, 469, 469, 1, 2359296, 0x767d1c45
-0, 484, 484, 1, 2359296, 0x0af42016
-0, 500, 500, 1, 2359296, 0xa2083e69
-0, 516, 516, 1, 2359296, 0xb68a1308
-0, 531, 531, 1, 2359296, 0x4f334c0e
-0, 547, 547, 1, 2359296, 0x98b74e4f
-0, 562, 562, 1, 2359296, 0xd9de4e4f
-0, 578, 578, 1, 2359296, 0xa17c4e4f
-0, 594, 594, 1, 2359296, 0xa49a665d
-0, 609, 609, 1, 2359296, 0xf5f87360
-0, 781, 781, 1, 2359296, 0x75747360
-0, 797, 797, 1, 2359296, 0x745d7360
-0, 812, 812, 1, 2359296, 0x33047360
-0, 828, 828, 1, 2359296, 0xf19c7360
-0, 844, 844, 1, 2359296, 0xb0437360
-0, 859, 859, 1, 2359296, 0xaf2c7360
-0, 875, 875, 1, 2359296, 0x2ea87360
-0, 891, 891, 1, 2359296, 0xee577360
-0, 953, 953, 1, 2359296, 0x6dd37360
-0, 1078, 1078, 1, 2359296, 0xab327965
-0, 1094, 1094, 1, 2359296, 0x5f8677d0
-0, 1109, 1109, 1, 2359296, 0x02135eb4
-0, 1125, 1125, 1, 2359296, 0x09784e4f
-0, 1141, 1141, 1, 2359296, 0xa140a62d
-0, 1156, 1156, 1, 2359296, 0xa140a62d
-0, 1484, 1484, 1, 2359296, 0xa140a62d
-0, 1516, 1516, 1, 2359296, 0xa140a62d
-0, 1547, 1547, 1, 2359296, 0xa140a62d
-0, 1641, 1641, 1, 2359296, 0xa140a62d
-0, 1642, 1642, 1, 2359296, 0xa140a62d
-0, 1656, 1656, 1, 2359296, 0xa140a62d
-0, 1657, 1657, 1, 2359296, 0xa140a62d
-0, 1672, 1672, 1, 2359296, 0xa140a62d
-0, 1673, 1673, 1, 2359296, 0x92024e4f
-0, 1687, 1687, 1, 2359296, 0xb1754dbe
-0, 1688, 1688, 1, 2359296, 0x15ee5eb4
-0, 1703, 1703, 1, 2359296, 0xb1d9746e
-0, 1719, 1719, 1, 2359296, 0xabe77360
-0, 1734, 1734, 1, 2359296, 0xaad07360
-0, 1750, 1750, 1, 2359296, 0x2a4c7360
-0, 1766, 1766, 1, 2359296, 0x69777360
-0, 1781, 1781, 1, 2359296, 0xe8e47360
-0, 2328, 2328, 1, 2359296, 0x29357360
-0, 3031, 3031, 1, 2359296, 0x69777360
-0, 3078, 3078, 1, 2359296, 0xa9b97360
-0, 3109, 3109, 1, 2359296, 0xd2697707
-0, 3141, 3141, 1, 2359296, 0x22a07965
-0, 3156, 3156, 1, 2359296, 0xf9327aa7
-0, 3172, 3172, 1, 2359296, 0xa5d277d0
-0, 3203, 3203, 1, 2359296, 0x97b6746e
-0, 3328, 3328, 1, 2359296, 0x80bb746e
-0, 4562, 4562, 1, 2359296, 0x530b719a
-0, 4672, 4672, 1, 2359296, 0x4827665d
-0, 4703, 4703, 1, 2359296, 0xc48c5eb4
-0, 5391, 5391, 1, 2359296, 0xe6465eb4
-0, 5578, 5578, 1, 2359296, 0xece455ec
-0, 5594, 5594, 1, 2359296, 0xb5344dbe
-0, 5609, 5609, 1, 2359296, 0xa140a62d
-0, 5625, 5625, 1, 2359296, 0xa140a62d
-0, 5641, 5641, 1, 2359296, 0xa140a62d
-0, 5642, 5642, 1, 2359296, 0xa140a62d
-0, 5656, 5656, 1, 2359296, 0xa140a62d
-0, 5672, 5672, 1, 2359296, 0xa140a62d
-0, 5703, 5703, 1, 2359296, 0xa140a62d
-0, 5750, 5750, 1, 2359296, 0xa140a62d
-0, 5766, 5766, 1, 2359296, 0xa140a62d
-0, 5781, 5781, 1, 2359296, 0xa140a62d
-0, 5797, 5797, 1, 2359296, 0xa140a62d
-0, 5812, 5812, 1, 2359296, 0xa140a62d
-0, 5875, 5875, 1, 2359296, 0xa140a62d
-0, 5922, 5922, 1, 2359296, 0xa140a62d
-0, 5984, 5984, 1, 2359296, 0xa140a62d
-0, 6031, 6031, 1, 2359296, 0xa140a62d
-0, 6047, 6047, 1, 2359296, 0xa140a62d
-0, 6062, 6062, 1, 2359296, 0xa140a62d
-0, 6406, 6406, 1, 2359296, 0xa140a62d
-0, 6453, 6453, 1, 2359296, 0xa140a62d
-0, 6469, 6469, 1, 2359296, 0xa140a62d
-0, 6484, 6484, 1, 2359296, 0xa140a62d
-0, 6500, 6500, 1, 2359296, 0xa140a62d
-0, 6516, 6516, 1, 2359296, 0xa140a62d
-0, 6531, 6531, 1, 2359296, 0xa140a62d
-0, 6547, 6547, 1, 2359296, 0xa140a62d
-0, 6562, 6562, 1, 2359296, 0x5c2a4cd9
-0, 6578, 6578, 1, 2359296, 0x28f94e4f
-0, 6594, 6594, 1, 2359296, 0x9acb4820
-0, 6609, 6609, 1, 2359296, 0x9ec716e1
-0, 6625, 6625, 1, 2359296, 0xaf5f3fa4
-0, 6641, 6641, 1, 2359296, 0x7d633218
-0, 6642, 6642, 1, 2359296, 0x34fb2016
-0, 6656, 6656, 1, 2359296, 0x61351665
-0, 6812, 6812, 1, 2359296, 0xb23c1039
-0, 6828, 6828, 1, 2359296, 0x59290d69
-0, 6844, 6844, 1, 2359296, 0x639c132d
-0, 6859, 6859, 1, 2359296, 0x0b252237
-0, 6875, 6875, 1, 2359296, 0xe66f2fc5
-0, 6891, 6891, 1, 2359296, 0xa8b33761
-0, 6906, 6906, 1, 2359296, 0x81a63f8b
-0, 6969, 6969, 1, 2359296, 0x18074843
-0, 6984, 6984, 1, 2359296, 0x434a5195
-0, 7000, 7000, 1, 2359296, 0x6da15116
-0, 7001, 7001, 1, 2359296, 0xca755420
-0, 7016, 7016, 1, 2359296, 0xe6fc5457
-0, 7017, 7017, 1, 2359296, 0x271d53fd
-0, 7031, 7031, 1, 2359296, 0xa15b554f
-0, 7281, 7281, 1, 2359296, 0x49f6578d
-0, 7282, 7282, 1, 2359296, 0x2c0c4e4f
-0, 7297, 7297, 1, 2359296, 0x7e924e4f
-0, 7298, 7298, 1, 2359296, 0x32ff4e4f
-0, 7312, 7312, 1, 2359296, 0x23ad4e4f
-0, 7313, 7313, 1, 2359296, 0x7ddc4e4f
-0, 7328, 7328, 1, 2359296, 0xd0624e4f
-0, 7329, 7329, 1, 2359296, 0x22f74e4f
-0, 7781, 7781, 1, 2359296, 0x49fa4e4f
-0, 7797, 7797, 1, 2359296, 0x6a5a5027
-0, 7812, 7812, 1, 2359296, 0x9f935027
-0, 7828, 7828, 1, 2359296, 0xc5e55027
-0, 7844, 7844, 1, 2359296, 0xd4cc5027
-0, 8250, 8250, 1, 2359296, 0xd2ab5027
-0, 8266, 8266, 1, 2359296, 0x68f04e4f
-0, 8281, 8281, 1, 2359296, 0xd0b44e4f
-0, 8297, 8297, 1, 2359296, 0xfced4e4f
-0, 8298, 8298, 1, 2359296, 0x8b0d4e4f
-0, 8312, 8312, 1, 2359296, 0x09db4e4f
-0, 8328, 8328, 1, 2359296, 0x4d0f4e4f
-0, 8329, 8329, 1, 2359296, 0xad824dbe
-0, 8344, 8344, 1, 2359296, 0x9aca4dbe
-0, 8345, 8345, 1, 2359296, 0x755a4dbe
-0, 8359, 8359, 1, 2359296, 0xc6824d2d
-0, 8360, 8360, 1, 2359296, 0x7c344c0e
-0, 8375, 8375, 1, 2359296, 0x50f04c0e
-0, 8391, 8391, 1, 2359296, 0xfa594c0e
-0, 8406, 8406, 1, 2359296, 0x4d494c0e
-0, 8422, 8422, 1, 2359296, 0xf6b24c0e
-0, 8437, 8437, 1, 2359296, 0xcb6e4c0e
-0, 8453, 8453, 1, 2359296, 0xbd024c0e
-0, 8516, 8516, 1, 2359296, 0x245b4dbe
-0, 8531, 8531, 1, 2359296, 0x47874e4f
-0, 8547, 8547, 1, 2359296, 0xdead4e4f
-0, 8562, 8562, 1, 2359296, 0x847e4e4f
-0, 9344, 9344, 1, 2359296, 0x1a13e47c
-0, 9345, 9345, 1, 2359296, 0x46b3e321
-0, 9876, 9876, 1, 2359296, 0x76c0e35d
-0, 9922, 9922, 1, 2359296, 0xf6d9e519
-0, 9938, 9938, 1, 2359296, 0xac0fe4b3
-0, 9954, 9954, 1, 2359296, 0x3a3fe424
-0, 9955, 9955, 1, 2359296, 0xa97ce1a8
-0, 9969, 9969, 1, 2359296, 0x12fae01d
-0, 9970, 9970, 1, 2359296, 0x65b4df14
-0, 9985, 9985, 1, 2359296, 0x82d0e032
-0, 9986, 9986, 1, 2359296, 0xa452e0cf
-0, 10001, 10001, 1, 2359296, 0x22d6df37
+0, 47, 47, 0, 2359296, 0xb4434e4f
+0, 62, 62, 0, 2359296, 0x59cb5027
+0, 78, 78, 0, 2359296, 0xe9bc578d
+0, 109, 109, 0, 2359296, 0x5d17554f
+0, 125, 125, 0, 2359296, 0x6d685457
+0, 437, 437, 0, 2359296, 0x13205420
+0, 438, 438, 0, 2359296, 0xb8e15116
+0, 453, 453, 0, 2359296, 0x2ca55195
+0, 469, 469, 0, 2359296, 0x767d1c45
+0, 484, 484, 0, 2359296, 0x0af42016
+0, 500, 500, 0, 2359296, 0xa2083e69
+0, 516, 516, 0, 2359296, 0xb68a1308
+0, 531, 531, 0, 2359296, 0x4f334c0e
+0, 547, 547, 0, 2359296, 0x98b74e4f
+0, 562, 562, 0, 2359296, 0xd9de4e4f
+0, 578, 578, 0, 2359296, 0xa17c4e4f
+0, 594, 594, 0, 2359296, 0xa49a665d
+0, 609, 609, 0, 2359296, 0xf5f87360
+0, 781, 781, 0, 2359296, 0x75747360
+0, 797, 797, 0, 2359296, 0x745d7360
+0, 812, 812, 0, 2359296, 0x33047360
+0, 828, 828, 0, 2359296, 0xf19c7360
+0, 844, 844, 0, 2359296, 0xb0437360
+0, 859, 859, 0, 2359296, 0xaf2c7360
+0, 875, 875, 0, 2359296, 0x2ea87360
+0, 891, 891, 0, 2359296, 0xee577360
+0, 953, 953, 0, 2359296, 0x6dd37360
+0, 1078, 1078, 0, 2359296, 0xab327965
+0, 1094, 1094, 0, 2359296, 0x5f8677d0
+0, 1109, 1109, 0, 2359296, 0x02135eb4
+0, 1125, 1125, 0, 2359296, 0x09784e4f
+0, 1141, 1141, 0, 2359296, 0xa140a62d
+0, 1156, 1156, 0, 2359296, 0xa140a62d
+0, 1484, 1484, 0, 2359296, 0xa140a62d
+0, 1516, 1516, 0, 2359296, 0xa140a62d
+0, 1547, 1547, 0, 2359296, 0xa140a62d
+0, 1641, 1641, 0, 2359296, 0xa140a62d
+0, 1642, 1642, 0, 2359296, 0xa140a62d
+0, 1656, 1656, 0, 2359296, 0xa140a62d
+0, 1657, 1657, 0, 2359296, 0xa140a62d
+0, 1672, 1672, 0, 2359296, 0xa140a62d
+0, 1673, 1673, 0, 2359296, 0x92024e4f
+0, 1687, 1687, 0, 2359296, 0xb1754dbe
+0, 1688, 1688, 0, 2359296, 0x15ee5eb4
+0, 1703, 1703, 0, 2359296, 0xb1d9746e
+0, 1719, 1719, 0, 2359296, 0xabe77360
+0, 1734, 1734, 0, 2359296, 0xaad07360
+0, 1750, 1750, 0, 2359296, 0x2a4c7360
+0, 1766, 1766, 0, 2359296, 0x69777360
+0, 1781, 1781, 0, 2359296, 0xe8e47360
+0, 2328, 2328, 0, 2359296, 0x29357360
+0, 3031, 3031, 0, 2359296, 0x69777360
+0, 3078, 3078, 0, 2359296, 0xa9b97360
+0, 3109, 3109, 0, 2359296, 0xd2697707
+0, 3141, 3141, 0, 2359296, 0x22a07965
+0, 3156, 3156, 0, 2359296, 0xf9327aa7
+0, 3172, 3172, 0, 2359296, 0xa5d277d0
+0, 3203, 3203, 0, 2359296, 0x97b6746e
+0, 3328, 3328, 0, 2359296, 0x80bb746e
+0, 4562, 4562, 0, 2359296, 0x530b719a
+0, 4672, 4672, 0, 2359296, 0x4827665d
+0, 4703, 4703, 0, 2359296, 0xc48c5eb4
+0, 5391, 5391, 0, 2359296, 0xe6465eb4
+0, 5578, 5578, 0, 2359296, 0xece455ec
+0, 5594, 5594, 0, 2359296, 0xb5344dbe
+0, 5609, 5609, 0, 2359296, 0xa140a62d
+0, 5625, 5625, 0, 2359296, 0xa140a62d
+0, 5641, 5641, 0, 2359296, 0xa140a62d
+0, 5642, 5642, 0, 2359296, 0xa140a62d
+0, 5656, 5656, 0, 2359296, 0xa140a62d
+0, 5672, 5672, 0, 2359296, 0xa140a62d
+0, 5703, 5703, 0, 2359296, 0xa140a62d
+0, 5750, 5750, 0, 2359296, 0xa140a62d
+0, 5766, 5766, 0, 2359296, 0xa140a62d
+0, 5781, 5781, 0, 2359296, 0xa140a62d
+0, 5797, 5797, 0, 2359296, 0xa140a62d
+0, 5812, 5812, 0, 2359296, 0xa140a62d
+0, 5875, 5875, 0, 2359296, 0xa140a62d
+0, 5922, 5922, 0, 2359296, 0xa140a62d
+0, 5984, 5984, 0, 2359296, 0xa140a62d
+0, 6031, 6031, 0, 2359296, 0xa140a62d
+0, 6047, 6047, 0, 2359296, 0xa140a62d
+0, 6062, 6062, 0, 2359296, 0xa140a62d
+0, 6406, 6406, 0, 2359296, 0xa140a62d
+0, 6453, 6453, 0, 2359296, 0xa140a62d
+0, 6469, 6469, 0, 2359296, 0xa140a62d
+0, 6484, 6484, 0, 2359296, 0xa140a62d
+0, 6500, 6500, 0, 2359296, 0xa140a62d
+0, 6516, 6516, 0, 2359296, 0xa140a62d
+0, 6531, 6531, 0, 2359296, 0xa140a62d
+0, 6547, 6547, 0, 2359296, 0xa140a62d
+0, 6562, 6562, 0, 2359296, 0x5c2a4cd9
+0, 6578, 6578, 0, 2359296, 0x28f94e4f
+0, 6594, 6594, 0, 2359296, 0x9acb4820
+0, 6609, 6609, 0, 2359296, 0x9ec716e1
+0, 6625, 6625, 0, 2359296, 0xaf5f3fa4
+0, 6641, 6641, 0, 2359296, 0x7d633218
+0, 6642, 6642, 0, 2359296, 0x34fb2016
+0, 6656, 6656, 0, 2359296, 0x61351665
+0, 6812, 6812, 0, 2359296, 0xb23c1039
+0, 6828, 6828, 0, 2359296, 0x59290d69
+0, 6844, 6844, 0, 2359296, 0x639c132d
+0, 6859, 6859, 0, 2359296, 0x0b252237
+0, 6875, 6875, 0, 2359296, 0xe66f2fc5
+0, 6891, 6891, 0, 2359296, 0xa8b33761
+0, 6906, 6906, 0, 2359296, 0x81a63f8b
+0, 6969, 6969, 0, 2359296, 0x18074843
+0, 6984, 6984, 0, 2359296, 0x434a5195
+0, 7000, 7000, 0, 2359296, 0x6da15116
+0, 7001, 7001, 0, 2359296, 0xca755420
+0, 7016, 7016, 0, 2359296, 0xe6fc5457
+0, 7017, 7017, 0, 2359296, 0x271d53fd
+0, 7031, 7031, 0, 2359296, 0xa15b554f
+0, 7281, 7281, 0, 2359296, 0x49f6578d
+0, 7282, 7282, 0, 2359296, 0x2c0c4e4f
+0, 7297, 7297, 0, 2359296, 0x7e924e4f
+0, 7298, 7298, 0, 2359296, 0x32ff4e4f
+0, 7312, 7312, 0, 2359296, 0x23ad4e4f
+0, 7313, 7313, 0, 2359296, 0x7ddc4e4f
+0, 7328, 7328, 0, 2359296, 0xd0624e4f
+0, 7329, 7329, 0, 2359296, 0x22f74e4f
+0, 7781, 7781, 0, 2359296, 0x49fa4e4f
+0, 7797, 7797, 0, 2359296, 0x6a5a5027
+0, 7812, 7812, 0, 2359296, 0x9f935027
+0, 7828, 7828, 0, 2359296, 0xc5e55027
+0, 7844, 7844, 0, 2359296, 0xd4cc5027
+0, 8250, 8250, 0, 2359296, 0xd2ab5027
+0, 8266, 8266, 0, 2359296, 0x68f04e4f
+0, 8281, 8281, 0, 2359296, 0xd0b44e4f
+0, 8297, 8297, 0, 2359296, 0xfced4e4f
+0, 8298, 8298, 0, 2359296, 0x8b0d4e4f
+0, 8312, 8312, 0, 2359296, 0x09db4e4f
+0, 8328, 8328, 0, 2359296, 0x4d0f4e4f
+0, 8329, 8329, 0, 2359296, 0xad824dbe
+0, 8344, 8344, 0, 2359296, 0x9aca4dbe
+0, 8345, 8345, 0, 2359296, 0x755a4dbe
+0, 8359, 8359, 0, 2359296, 0xc6824d2d
+0, 8360, 8360, 0, 2359296, 0x7c344c0e
+0, 8375, 8375, 0, 2359296, 0x50f04c0e
+0, 8391, 8391, 0, 2359296, 0xfa594c0e
+0, 8406, 8406, 0, 2359296, 0x4d494c0e
+0, 8422, 8422, 0, 2359296, 0xf6b24c0e
+0, 8437, 8437, 0, 2359296, 0xcb6e4c0e
+0, 8453, 8453, 0, 2359296, 0xbd024c0e
+0, 8516, 8516, 0, 2359296, 0x245b4dbe
+0, 8531, 8531, 0, 2359296, 0x47874e4f
+0, 8547, 8547, 0, 2359296, 0xdead4e4f
+0, 8562, 8562, 0, 2359296, 0x847e4e4f
+0, 9344, 9344, 0, 2359296, 0x1a13e47c
+0, 9345, 9345, 0, 2359296, 0x46b3e321
+0, 9876, 9876, 0, 2359296, 0x76c0e35d
+0, 9922, 9922, 0, 2359296, 0xf6d9e519
+0, 9938, 9938, 0, 2359296, 0xac0fe4b3
+0, 9954, 9954, 0, 2359296, 0x3a3fe424
+0, 9955, 9955, 0, 2359296, 0xa97ce1a8
+0, 9969, 9969, 0, 2359296, 0x12fae01d
+0, 9970, 9970, 0, 2359296, 0x65b4df14
+0, 9985, 9985, 0, 2359296, 0x82d0e032
+0, 9986, 9986, 0, 2359296, 0xa452e0cf
+0, 10001, 10001, 0, 2359296, 0x22d6df37
diff --git a/tests/ref/fate/iff-byterun1 b/tests/ref/fate/iff-byterun1
index 9e5aaa0c7b..6f80c72d47 100644
--- a/tests/ref/fate/iff-byterun1
+++ b/tests/ref/fate/iff-byterun1
@@ -1,2 +1,2 @@
#tb 0: 1/90000
-0, 0, 0, 1, 230400, 0x35e51c62
+0, 0, 0, 0, 230400, 0x35e51c62
diff --git a/tests/ref/fate/iff-ilbm b/tests/ref/fate/iff-ilbm
index cb7ec6473f..a801aff46d 100644
--- a/tests/ref/fate/iff-ilbm
+++ b/tests/ref/fate/iff-ilbm
@@ -1,2 +1,2 @@
#tb 0: 1/90000
-0, 0, 0, 1, 230400, 0x0929e342
+0, 0, 0, 0, 230400, 0x0929e342
diff --git a/tests/ref/fate/mimic b/tests/ref/fate/mimic
index 5070456e23..217d487b10 100644
--- a/tests/ref/fate/mimic
+++ b/tests/ref/fate/mimic
@@ -1,77 +1,77 @@
#tb 0: 1/1000
-0, 0, 0, 1, 115200, 0xa974d407
-0, 548, 548, 1, 115200, 0x72618b84
-0, 1088, 1088, 1, 115200, 0x87768573
-0, 1759, 1759, 1, 115200, 0x5d218e3e
-0, 2437, 2437, 1, 115200, 0x0c0db41c
-0, 3076, 3076, 1, 115200, 0xb777fd48
-0, 3908, 3908, 1, 115200, 0x40765de7
-0, 4545, 4545, 1, 115200, 0x370a3c90
-0, 5092, 5092, 1, 115200, 0xc605785a
-0, 6016, 6016, 1, 115200, 0x49468b23
-0, 6560, 6560, 1, 115200, 0x986b6fd4
-0, 7648, 7648, 1, 115200, 0x30f22ef8
-0, 8164, 8164, 1, 115200, 0xa90bd608
-0, 8836, 8836, 1, 115200, 0x9cf36518
-0, 9632, 9632, 1, 115200, 0x4ef1a679
-0, 9922, 9922, 1, 115200, 0x0df65873
-0, 10316, 10316, 1, 115200, 0xfecd4233
-0, 11104, 11104, 1, 115200, 0xee2f26cb
-0, 11776, 11776, 1, 115200, 0x795f612d
-0, 12321, 12321, 1, 115200, 0xbbb90125
-0, 12992, 12992, 1, 115200, 0x9230fb6e
-0, 13805, 13805, 1, 115200, 0x11869996
-0, 14468, 14468, 1, 115200, 0x6b5c892b
-0, 15136, 15136, 1, 115200, 0x88bdb9cd
-0, 15937, 15937, 1, 115200, 0x364bc5a0
-0, 16608, 16608, 1, 115200, 0x6b66d817
-0, 17281, 17281, 1, 115200, 0xd3a41252
-0, 18089, 18089, 1, 115200, 0x0cf5612f
-0, 18754, 18754, 1, 115200, 0x9752d055
-0, 19808, 19808, 1, 115200, 0x486e9f6f
-0, 20484, 20484, 1, 115200, 0x3eab62f8
-0, 21031, 21031, 1, 115200, 0xa7f52762
-0, 21957, 21957, 1, 115200, 0xfd4c4bbc
-0, 22498, 22498, 1, 115200, 0x194023f6
-0, 22880, 22880, 1, 115200, 0xd4668dad
-0, 23680, 23680, 1, 115200, 0x6b20d64b
-0, 24353, 24353, 1, 115200, 0xf2572aae
-0, 24901, 24901, 1, 115200, 0xc3554f25
-0, 25695, 25695, 1, 115200, 0xeeb5073a
-0, 26495, 26495, 1, 115200, 0xbd46291f
-0, 27040, 27040, 1, 115200, 0x0526838d
-0, 28107, 28107, 1, 115200, 0x85b2e864
-0, 28778, 28778, 1, 115200, 0xcfd894bc
-0, 29316, 29316, 1, 115200, 0x644f10fb
-0, 30240, 30240, 1, 115200, 0x556e4d88
-0, 30786, 30786, 1, 115200, 0x93243614
-0, 31983, 31983, 1, 115200, 0x754275c5
-0, 32929, 32929, 1, 115200, 0x7f648bf3
-0, 33600, 33600, 1, 115200, 0xece18c9b
-0, 34271, 34271, 1, 115200, 0x385d52c1
-0, 35201, 35201, 1, 115200, 0xafc58e4a
-0, 35743, 35743, 1, 115200, 0x50daf750
-0, 36384, 36384, 1, 115200, 0xf6bc67d1
-0, 37344, 37344, 1, 115200, 0xb64b6e07
-0, 38028, 38028, 1, 115200, 0x8751ed15
-0, 38657, 38657, 1, 115200, 0x329ce803
-0, 39334, 39334, 1, 115200, 0x40b2cb05
-0, 40129, 40129, 1, 115200, 0x60f3517d
-0, 40802, 40802, 1, 115200, 0xe0d46fdf
-0, 41472, 41472, 1, 115200, 0x204529fa
-0, 42276, 42276, 1, 115200, 0xd5afaf22
-0, 42944, 42944, 1, 115200, 0xd3cb3d4c
-0, 43616, 43616, 1, 115200, 0x87973a79
-0, 44421, 44421, 1, 115200, 0xe3b2f917
-0, 45092, 45092, 1, 115200, 0xf1923238
-0, 45632, 45632, 1, 115200, 0x51494d71
-0, 46561, 46561, 1, 115200, 0x58bc59bb
-0, 47105, 47105, 1, 115200, 0xd0273fdb
-0, 47776, 47776, 1, 115200, 0x6cc79700
-0, 48294, 48294, 1, 115200, 0xc8172d31
-0, 48960, 48960, 1, 115200, 0x8eb037ef
-0, 49504, 49504, 1, 115200, 0xc0bc2d76
-0, 50053, 50053, 1, 115200, 0x663c467a
-0, 50597, 50597, 1, 115200, 0xd085e950
-0, 51520, 51520, 1, 115200, 0x7d198d72
-0, 52092, 52092, 1, 115200, 0x6ebacda0
+0, 0, 0, 0, 115200, 0xa974d407
+0, 548, 548, 0, 115200, 0x72618b84
+0, 1088, 1088, 0, 115200, 0x87768573
+0, 1759, 1759, 0, 115200, 0x5d218e3e
+0, 2437, 2437, 0, 115200, 0x0c0db41c
+0, 3076, 3076, 0, 115200, 0xb777fd48
+0, 3908, 3908, 0, 115200, 0x40765de7
+0, 4545, 4545, 0, 115200, 0x370a3c90
+0, 5092, 5092, 0, 115200, 0xc605785a
+0, 6016, 6016, 0, 115200, 0x49468b23
+0, 6560, 6560, 0, 115200, 0x986b6fd4
+0, 7648, 7648, 0, 115200, 0x30f22ef8
+0, 8164, 8164, 0, 115200, 0xa90bd608
+0, 8836, 8836, 0, 115200, 0x9cf36518
+0, 9632, 9632, 0, 115200, 0x4ef1a679
+0, 9922, 9922, 0, 115200, 0x0df65873
+0, 10316, 10316, 0, 115200, 0xfecd4233
+0, 11104, 11104, 0, 115200, 0xee2f26cb
+0, 11776, 11776, 0, 115200, 0x795f612d
+0, 12321, 12321, 0, 115200, 0xbbb90125
+0, 12992, 12992, 0, 115200, 0x9230fb6e
+0, 13805, 13805, 0, 115200, 0x11869996
+0, 14468, 14468, 0, 115200, 0x6b5c892b
+0, 15136, 15136, 0, 115200, 0x88bdb9cd
+0, 15937, 15937, 0, 115200, 0x364bc5a0
+0, 16608, 16608, 0, 115200, 0x6b66d817
+0, 17281, 17281, 0, 115200, 0xd3a41252
+0, 18089, 18089, 0, 115200, 0x0cf5612f
+0, 18754, 18754, 0, 115200, 0x9752d055
+0, 19808, 19808, 0, 115200, 0x486e9f6f
+0, 20484, 20484, 0, 115200, 0x3eab62f8
+0, 21031, 21031, 0, 115200, 0xa7f52762
+0, 21957, 21957, 0, 115200, 0xfd4c4bbc
+0, 22498, 22498, 0, 115200, 0x194023f6
+0, 22880, 22880, 0, 115200, 0xd4668dad
+0, 23680, 23680, 0, 115200, 0x6b20d64b
+0, 24353, 24353, 0, 115200, 0xf2572aae
+0, 24901, 24901, 0, 115200, 0xc3554f25
+0, 25695, 25695, 0, 115200, 0xeeb5073a
+0, 26495, 26495, 0, 115200, 0xbd46291f
+0, 27040, 27040, 0, 115200, 0x0526838d
+0, 28107, 28107, 0, 115200, 0x85b2e864
+0, 28778, 28778, 0, 115200, 0xcfd894bc
+0, 29316, 29316, 0, 115200, 0x644f10fb
+0, 30240, 30240, 0, 115200, 0x556e4d88
+0, 30786, 30786, 0, 115200, 0x93243614
+0, 31983, 31983, 0, 115200, 0x754275c5
+0, 32929, 32929, 0, 115200, 0x7f648bf3
+0, 33600, 33600, 0, 115200, 0xece18c9b
+0, 34271, 34271, 0, 115200, 0x385d52c1
+0, 35201, 35201, 0, 115200, 0xafc58e4a
+0, 35743, 35743, 0, 115200, 0x50daf750
+0, 36384, 36384, 0, 115200, 0xf6bc67d1
+0, 37344, 37344, 0, 115200, 0xb64b6e07
+0, 38028, 38028, 0, 115200, 0x8751ed15
+0, 38657, 38657, 0, 115200, 0x329ce803
+0, 39334, 39334, 0, 115200, 0x40b2cb05
+0, 40129, 40129, 0, 115200, 0x60f3517d
+0, 40802, 40802, 0, 115200, 0xe0d46fdf
+0, 41472, 41472, 0, 115200, 0x204529fa
+0, 42276, 42276, 0, 115200, 0xd5afaf22
+0, 42944, 42944, 0, 115200, 0xd3cb3d4c
+0, 43616, 43616, 0, 115200, 0x87973a79
+0, 44421, 44421, 0, 115200, 0xe3b2f917
+0, 45092, 45092, 0, 115200, 0xf1923238
+0, 45632, 45632, 0, 115200, 0x51494d71
+0, 46561, 46561, 0, 115200, 0x58bc59bb
+0, 47105, 47105, 0, 115200, 0xd0273fdb
+0, 47776, 47776, 0, 115200, 0x6cc79700
+0, 48294, 48294, 0, 115200, 0xc8172d31
+0, 48960, 48960, 0, 115200, 0x8eb037ef
+0, 49504, 49504, 0, 115200, 0xc0bc2d76
+0, 50053, 50053, 0, 115200, 0x663c467a
+0, 50597, 50597, 0, 115200, 0xd085e950
+0, 51520, 51520, 0, 115200, 0x7d198d72
+0, 52092, 52092, 0, 115200, 0x6ebacda0
diff --git a/tests/ref/fate/mss2-pal b/tests/ref/fate/mss2-pal
index aee91b8cd2..ae8bd6fc39 100644
--- a/tests/ref/fate/mss2-pal
+++ b/tests/ref/fate/mss2-pal
@@ -1,3 +1,3 @@
#tb 0: 1/1000
-0, 0, 0, 1, 9216, 0xd3c106ef
-0, 100, 100, 1, 9216, 0x8871f7c2
+0, 0, 0, 0, 9216, 0xd3c106ef
+0, 100, 100, 0, 9216, 0x8871f7c2
diff --git a/tests/ref/fate/mss2-pals b/tests/ref/fate/mss2-pals
index aee91b8cd2..ae8bd6fc39 100644
--- a/tests/ref/fate/mss2-pals
+++ b/tests/ref/fate/mss2-pals
@@ -1,3 +1,3 @@
#tb 0: 1/1000
-0, 0, 0, 1, 9216, 0xd3c106ef
-0, 100, 100, 1, 9216, 0x8871f7c2
+0, 0, 0, 0, 9216, 0xd3c106ef
+0, 100, 100, 0, 9216, 0x8871f7c2
diff --git a/tests/ref/fate/mss2-rgb555 b/tests/ref/fate/mss2-rgb555
index 62ffbf4428..d15b3b4e6d 100644
--- a/tests/ref/fate/mss2-rgb555
+++ b/tests/ref/fate/mss2-rgb555
@@ -1,3 +1,3 @@
#tb 0: 1/1000
-0, 0, 0, 1, 6144, 0x4145b7ae
-0, 100, 100, 1, 6144, 0x3b2b38de
+0, 0, 0, 0, 6144, 0x4145b7ae
+0, 100, 100, 0, 6144, 0x3b2b38de
diff --git a/tests/ref/fate/mss2-rgb555s b/tests/ref/fate/mss2-rgb555s
index 62ffbf4428..d15b3b4e6d 100644
--- a/tests/ref/fate/mss2-rgb555s
+++ b/tests/ref/fate/mss2-rgb555s
@@ -1,3 +1,3 @@
#tb 0: 1/1000
-0, 0, 0, 1, 6144, 0x4145b7ae
-0, 100, 100, 1, 6144, 0x3b2b38de
+0, 0, 0, 0, 6144, 0x4145b7ae
+0, 100, 100, 0, 6144, 0x3b2b38de
diff --git a/tests/ref/fate/vp9-tiling-pedestrian b/tests/ref/fate/vp9-tiling-pedestrian
index 9d288fdabe..2915323e41 100644
--- a/tests/ref/fate/vp9-tiling-pedestrian
+++ b/tests/ref/fate/vp9-tiling-pedestrian
@@ -3,5 +3,5 @@
#hash: MD5
#tb 0: 1/1000
#stream#, dts, pts, duration, size, hash
-0, 0, 0, 1, 3110400, 1e6c2e768a5107e57e6d626f0511193a
-0, 40, 40, 1, 3110400, 972d3e2b5ee2e3b0907218a243e4cb7d
+0, 0, 0, 0, 3110400, 1e6c2e768a5107e57e6d626f0511193a
+0, 40, 40, 0, 3110400, 972d3e2b5ee2e3b0907218a243e4cb7d
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:12:42 +0000