aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ffmpeg.c6
-rw-r--r--ffmpeg.h3
-rw-r--r--ffmpeg_opt.c2
-rw-r--r--tests/ref/fate/adpcm-ima-amv310
-rw-r--r--tests/ref/fate/adpcm-ima-smjpeg666
-rw-r--r--tests/ref/lavf/mxf2
6 files changed, 497 insertions, 492 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 7dc4a3eb81..f2d0b67c09 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1525,9 +1525,9 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
decoded_frame_tb = AV_TIME_BASE_Q;
}
if (decoded_frame->pts != AV_NOPTS_VALUE)
- decoded_frame->pts = av_rescale_q(decoded_frame->pts,
- decoded_frame_tb,
- (AVRational){1, ist->st->codec->sample_rate});
+ decoded_frame->pts = av_rescale_delta(decoded_frame_tb, decoded_frame->pts,
+ (AVRational){1, ist->st->codec->sample_rate}, decoded_frame->nb_samples, &ist->filter_in_rescale_delta_last,
+ (AVRational){1, ist->st->codec->sample_rate});
for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_add_frame(ist->filters[i]->filter, decoded_frame,
AV_BUFFERSRC_FLAG_PUSH);
diff --git a/ffmpeg.h b/ffmpeg.h
index 292670a59f..e981a74f52 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -217,6 +217,9 @@ typedef struct InputStream {
int64_t next_pts; ///< synthetic pts for the next decode frame (in AV_TIME_BASE units)
int64_t pts; ///< current pts of the decoded frame (in AV_TIME_BASE units)
int wrap_correction_done;
+
+ int64_t filter_in_rescale_delta_last;
+
double ts_scale;
int is_start; /* is 1 at the start and after a discontinuity */
int saw_first_ts;
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 1231e097ec..f4067c0415 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -586,6 +586,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
ist->reinit_filters = -1;
MATCH_PER_STREAM_OPT(reinit_filters, i, ist->reinit_filters, ic, st);
+ ist->filter_in_rescale_delta_last = AV_NOPTS_VALUE;
+
switch (dec->codec_type) {
case AVMEDIA_TYPE_VIDEO:
if(!ist->dec)
diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv
index 6c2fa32726..ca7a168135 100644
--- a/tests/ref/fate/adpcm-ima-amv
+++ b/tests/ref/fate/adpcm-ima-amv
@@ -3,159 +3,159 @@
0, 1378, 1378, 1378, 2756, 0x8462443f
0, 2756, 2756, 1378, 2756, 0x9f493ba6
0, 4134, 4134, 1378, 2756, 0x634e5f06
-0, 5513, 5513, 1380, 2760, 0x51f35cd4
-0, 6891, 6891, 1378, 2756, 0x011c51e5
-0, 8269, 8269, 1378, 2756, 0x8c2c198c
-0, 9647, 9647, 1378, 2756, 0x2b4a3397
-0, 11025, 11025, 1378, 2756, 0x63794f22
-0, 12403, 12403, 1378, 2756, 0xfc363898
-0, 13781, 13781, 1378, 2756, 0x0da5486e
-0, 15159, 15159, 1378, 2756, 0xbae17a5f
+0, 5512, 5512, 1380, 2760, 0x51f35cd4
+0, 6892, 6892, 1378, 2756, 0x011c51e5
+0, 8270, 8270, 1378, 2756, 0x8c2c198c
+0, 9648, 9648, 1378, 2756, 0x2b4a3397
+0, 11026, 11026, 1378, 2756, 0x63794f22
+0, 12404, 12404, 1378, 2756, 0xfc363898
+0, 13782, 13782, 1378, 2756, 0x0da5486e
+0, 15160, 15160, 1378, 2756, 0xbae17a5f
0, 16538, 16538, 1380, 2760, 0xba266e1b
-0, 17916, 17916, 1378, 2756, 0xdfb61002
-0, 19294, 19294, 1378, 2756, 0x15d029da
-0, 20672, 20672, 1378, 2756, 0x7bc82012
-0, 22050, 22050, 1378, 2756, 0x002e6999
-0, 23428, 23428, 1378, 2756, 0x96346ba6
-0, 24806, 24806, 1378, 2756, 0x3d54543b
-0, 26184, 26184, 1380, 2760, 0x601786e1
-0, 27563, 27563, 1378, 2756, 0xf22a5793
-0, 28941, 28941, 1378, 2756, 0x21f54d49
-0, 30319, 30319, 1378, 2756, 0x0c6d4399
-0, 31697, 31697, 1378, 2756, 0x17282f8e
-0, 33075, 33075, 1378, 2756, 0xeb698f75
-0, 34453, 34453, 1378, 2756, 0x935e1de2
-0, 35831, 35831, 1380, 2760, 0xb6fb4293
-0, 37209, 37209, 1378, 2756, 0x485053dc
-0, 38588, 38588, 1378, 2756, 0x24c35027
-0, 39966, 39966, 1378, 2756, 0x09f323ee
-0, 41344, 41344, 1378, 2756, 0xbc7d58d5
-0, 42722, 42722, 1378, 2756, 0xaefd487c
-0, 44100, 44100, 1378, 2756, 0xaca16cc0
-0, 45478, 45478, 1380, 2760, 0x98a76091
-0, 46856, 46856, 1378, 2756, 0x5d357141
-0, 48234, 48234, 1378, 2756, 0x65ea2657
-0, 49613, 49613, 1378, 2756, 0xb5e1334a
-0, 50991, 50991, 1378, 2756, 0x32cd5d91
-0, 52369, 52369, 1378, 2756, 0xdc23722b
-0, 53747, 53747, 1378, 2756, 0x2ba34684
-0, 55125, 55125, 1378, 2756, 0xf9755ba8
-0, 56503, 56503, 1380, 2760, 0x24221ddb
-0, 57881, 57881, 1378, 2756, 0xef843aa4
-0, 59259, 59259, 1378, 2756, 0x420442fe
-0, 60638, 60638, 1378, 2756, 0x5a0933cb
-0, 62016, 62016, 1378, 2756, 0xef5f6d61
-0, 63394, 63394, 1378, 2756, 0xe57e6dc0
-0, 64772, 64772, 1378, 2756, 0xc0f0495a
-0, 66150, 66150, 1380, 2760, 0x2c3b55df
-0, 67528, 67528, 1378, 2756, 0x39c2586c
-0, 68906, 68906, 1378, 2756, 0x7ffc46e5
-0, 70284, 70284, 1378, 2756, 0xa2766664
-0, 71663, 71663, 1378, 2756, 0xacb50c6c
-0, 73041, 73041, 1378, 2756, 0x7f659084
-0, 74419, 74419, 1378, 2756, 0xc72e6a12
-0, 75797, 75797, 1380, 2760, 0xdb6944df
-0, 77175, 77175, 1378, 2756, 0x954f45c1
-0, 78553, 78553, 1378, 2756, 0xa9484240
-0, 79931, 79931, 1378, 2756, 0x1d595349
-0, 81309, 81309, 1378, 2756, 0xcf2a565e
-0, 82688, 82688, 1378, 2756, 0x391028d5
-0, 84066, 84066, 1378, 2756, 0x348db7ad
-0, 85444, 85444, 1380, 2760, 0xb69b5e3a
-0, 86822, 86822, 1378, 2756, 0xe3635fbe
-0, 88200, 88200, 1378, 2756, 0xdcad3654
-0, 89578, 89578, 1378, 2756, 0x5c17abef
-0, 90956, 90956, 1378, 2756, 0xb3235184
-0, 92334, 92334, 1378, 2756, 0xdabb64a6
-0, 93713, 93713, 1378, 2756, 0xa95dc58d
-0, 95091, 95091, 1380, 2760, 0x8e7ac9eb
-0, 96469, 96469, 1378, 2756, 0x492b658e
-0, 97847, 97847, 1378, 2756, 0x377483ab
-0, 99225, 99225, 1378, 2756, 0x2c250279
-0, 100603, 100603, 1378, 2756, 0x704dbdb3
-0, 101981, 101981, 1378, 2756, 0x800d7da2
-0, 103359, 103359, 1378, 2756, 0x872aa32e
-0, 104738, 104738, 1378, 2756, 0x2d4837fe
-0, 106116, 106116, 1380, 2760, 0xc89ea57e
-0, 107494, 107494, 1378, 2756, 0x6447d7ef
-0, 108872, 108872, 1378, 2756, 0x144f59cc
-0, 110250, 110250, 1378, 2756, 0xc667154e
-0, 111628, 111628, 1378, 2756, 0xf0de66ae
-0, 113006, 113006, 1378, 2756, 0xeabf3c32
-0, 114384, 114384, 1378, 2756, 0xe98e81d1
-0, 115763, 115763, 1380, 2760, 0x56aa5889
-0, 117141, 117141, 1378, 2756, 0x4fd34c0e
-0, 118519, 118519, 1378, 2756, 0x67cf6912
-0, 119897, 119897, 1378, 2756, 0xfa944def
-0, 121275, 121275, 1378, 2756, 0xc12f23b2
-0, 122653, 122653, 1378, 2756, 0x5ea325a2
-0, 124031, 124031, 1378, 2756, 0x2b245824
-0, 125409, 125409, 1380, 2760, 0x90ac533e
-0, 126788, 126788, 1378, 2756, 0xcca34d26
-0, 128166, 128166, 1378, 2756, 0xb5f820d0
-0, 129544, 129544, 1378, 2756, 0x27f24335
-0, 130922, 130922, 1378, 2756, 0x4a9e87b7
-0, 132300, 132300, 1378, 2756, 0xbd076129
-0, 133678, 133678, 1378, 2756, 0x2e0e3f2e
-0, 135056, 135056, 1380, 2760, 0xdf534478
-0, 136434, 136434, 1378, 2756, 0xca000a2e
-0, 137813, 137813, 1378, 2756, 0x87472df3
-0, 139191, 139191, 1378, 2756, 0x16733810
-0, 140569, 140569, 1378, 2756, 0xfa0734b4
-0, 141947, 141947, 1378, 2756, 0x5eff3fc4
-0, 143325, 143325, 1378, 2756, 0xf35346bd
-0, 144703, 144703, 1378, 2756, 0xac6411c5
-0, 146081, 146081, 1380, 2760, 0x478c3c56
-0, 147459, 147459, 1378, 2756, 0xebd30bdd
-0, 148838, 148838, 1378, 2756, 0xaef95a31
-0, 150216, 150216, 1378, 2756, 0x8aad29d1
-0, 151594, 151594, 1378, 2756, 0x626863f0
-0, 152972, 152972, 1378, 2756, 0x68c05707
-0, 154350, 154350, 1378, 2756, 0x437c5e8d
-0, 155728, 155728, 1380, 2760, 0x8eca4bdb
-0, 157106, 157106, 1378, 2756, 0x62bd4162
-0, 158484, 158484, 1378, 2756, 0x9f744aa4
-0, 159863, 159863, 1378, 2756, 0x0f3f6409
-0, 161241, 161241, 1378, 2756, 0x3fee827a
-0, 162619, 162619, 1378, 2756, 0x48a0ac19
-0, 163997, 163997, 1378, 2756, 0x8e4ce0d0
-0, 165375, 165375, 1380, 2760, 0xcda82236
-0, 166753, 166753, 1378, 2756, 0x0e523255
-0, 168131, 168131, 1378, 2756, 0x84103d30
-0, 169509, 169509, 1378, 2756, 0x13941cde
-0, 170888, 170888, 1378, 2756, 0x9fc834c5
-0, 172266, 172266, 1378, 2756, 0xc0217a77
-0, 173644, 173644, 1378, 2756, 0x3f643659
-0, 175022, 175022, 1380, 2760, 0x9dbd6002
-0, 176400, 176400, 1378, 2756, 0x94f046fb
-0, 177778, 177778, 1378, 2756, 0xab01fb12
-0, 179156, 179156, 1378, 2756, 0x04cffe5c
-0, 180534, 180534, 1378, 2756, 0xef661c5e
-0, 181913, 181913, 1378, 2756, 0x094c5fc5
-0, 183291, 183291, 1378, 2756, 0xe0c1486a
-0, 184669, 184669, 1380, 2760, 0x8c3535b7
-0, 186047, 186047, 1378, 2756, 0x594934aa
-0, 187425, 187425, 1378, 2756, 0x74007238
-0, 188803, 188803, 1378, 2756, 0x61f1394d
-0, 190181, 190181, 1378, 2756, 0x72584f07
-0, 191559, 191559, 1378, 2756, 0xced9acf9
-0, 192938, 192938, 1378, 2756, 0x7d2e3ea1
-0, 194316, 194316, 1378, 2756, 0x56c06897
-0, 195694, 195694, 1380, 2760, 0x19983bbf
-0, 197072, 197072, 1378, 2756, 0x4f884f27
-0, 198450, 198450, 1378, 2756, 0x81ab2f63
-0, 199828, 199828, 1378, 2756, 0x448e681d
-0, 201206, 201206, 1378, 2756, 0x0ba9826e
-0, 202584, 202584, 1378, 2756, 0x049f36fa
-0, 203963, 203963, 1378, 2756, 0x096a2b62
-0, 205341, 205341, 1380, 2760, 0x579e2035
-0, 206719, 206719, 1378, 2756, 0xd13e30e1
-0, 208097, 208097, 1378, 2756, 0x30b6412b
-0, 209475, 209475, 1378, 2756, 0xbb1c3268
-0, 210853, 210853, 1378, 2756, 0xbc175b6a
-0, 212231, 212231, 1378, 2756, 0xf8d160e2
-0, 213609, 213609, 1378, 2756, 0xc1048154
-0, 214988, 214988, 1380, 2760, 0xb83548f4
-0, 216366, 216366, 1378, 2756, 0x22647962
-0, 217744, 217744, 1378, 2756, 0x14ca54d3
-0, 219122, 219122, 1378, 2756, 0x58754b3a
+0, 17918, 17918, 1378, 2756, 0xdfb61002
+0, 19296, 19296, 1378, 2756, 0x15d029da
+0, 20674, 20674, 1378, 2756, 0x7bc82012
+0, 22052, 22052, 1378, 2756, 0x002e6999
+0, 23430, 23430, 1378, 2756, 0x96346ba6
+0, 24808, 24808, 1378, 2756, 0x3d54543b
+0, 26186, 26186, 1380, 2760, 0x601786e1
+0, 27566, 27566, 1378, 2756, 0xf22a5793
+0, 28944, 28944, 1378, 2756, 0x21f54d49
+0, 30322, 30322, 1378, 2756, 0x0c6d4399
+0, 31700, 31700, 1378, 2756, 0x17282f8e
+0, 33078, 33078, 1378, 2756, 0xeb698f75
+0, 34456, 34456, 1378, 2756, 0x935e1de2
+0, 35834, 35834, 1380, 2760, 0xb6fb4293
+0, 37214, 37214, 1378, 2756, 0x485053dc
+0, 38592, 38592, 1378, 2756, 0x24c35027
+0, 39970, 39970, 1378, 2756, 0x09f323ee
+0, 41348, 41348, 1378, 2756, 0xbc7d58d5
+0, 42726, 42726, 1378, 2756, 0xaefd487c
+0, 44104, 44104, 1378, 2756, 0xaca16cc0
+0, 45482, 45482, 1380, 2760, 0x98a76091
+0, 46862, 46862, 1378, 2756, 0x5d357141
+0, 48240, 48240, 1378, 2756, 0x65ea2657
+0, 49618, 49618, 1378, 2756, 0xb5e1334a
+0, 50996, 50996, 1378, 2756, 0x32cd5d91
+0, 52374, 52374, 1378, 2756, 0xdc23722b
+0, 53752, 53752, 1378, 2756, 0x2ba34684
+0, 55130, 55130, 1378, 2756, 0xf9755ba8
+0, 56508, 56508, 1380, 2760, 0x24221ddb
+0, 57888, 57888, 1378, 2756, 0xef843aa4
+0, 59266, 59266, 1378, 2756, 0x420442fe
+0, 60644, 60644, 1378, 2756, 0x5a0933cb
+0, 62022, 62022, 1378, 2756, 0xef5f6d61
+0, 63400, 63400, 1378, 2756, 0xe57e6dc0
+0, 64778, 64778, 1378, 2756, 0xc0f0495a
+0, 66156, 66156, 1380, 2760, 0x2c3b55df
+0, 67536, 67536, 1378, 2756, 0x39c2586c
+0, 68914, 68914, 1378, 2756, 0x7ffc46e5
+0, 70292, 70292, 1378, 2756, 0xa2766664
+0, 71670, 71670, 1378, 2756, 0xacb50c6c
+0, 73048, 73048, 1378, 2756, 0x7f659084
+0, 74426, 74426, 1378, 2756, 0xc72e6a12
+0, 75804, 75804, 1380, 2760, 0xdb6944df
+0, 77184, 77184, 1378, 2756, 0x954f45c1
+0, 78562, 78562, 1378, 2756, 0xa9484240
+0, 79940, 79940, 1378, 2756, 0x1d595349
+0, 81318, 81318, 1378, 2756, 0xcf2a565e
+0, 82696, 82696, 1378, 2756, 0x391028d5
+0, 84074, 84074, 1378, 2756, 0x348db7ad
+0, 85452, 85452, 1380, 2760, 0xb69b5e3a
+0, 86832, 86832, 1378, 2756, 0xe3635fbe
+0, 88210, 88210, 1378, 2756, 0xdcad3654
+0, 89588, 89588, 1378, 2756, 0x5c17abef
+0, 90966, 90966, 1378, 2756, 0xb3235184
+0, 92344, 92344, 1378, 2756, 0xdabb64a6
+0, 93722, 93722, 1378, 2756, 0xa95dc58d
+0, 95100, 95100, 1380, 2760, 0x8e7ac9eb
+0, 96480, 96480, 1378, 2756, 0x492b658e
+0, 97858, 97858, 1378, 2756, 0x377483ab
+0, 99236, 99236, 1378, 2756, 0x2c250279
+0, 100614, 100614, 1378, 2756, 0x704dbdb3
+0, 101992, 101992, 1378, 2756, 0x800d7da2
+0, 103370, 103370, 1378, 2756, 0x872aa32e
+0, 104748, 104748, 1378, 2756, 0x2d4837fe
+0, 106126, 106126, 1380, 2760, 0xc89ea57e
+0, 107506, 107506, 1378, 2756, 0x6447d7ef
+0, 108884, 108884, 1378, 2756, 0x144f59cc
+0, 110262, 110262, 1378, 2756, 0xc667154e
+0, 111640, 111640, 1378, 2756, 0xf0de66ae
+0, 113018, 113018, 1378, 2756, 0xeabf3c32
+0, 114396, 114396, 1378, 2756, 0xe98e81d1
+0, 115774, 115774, 1380, 2760, 0x56aa5889
+0, 117154, 117154, 1378, 2756, 0x4fd34c0e
+0, 118532, 118532, 1378, 2756, 0x67cf6912
+0, 119910, 119910, 1378, 2756, 0xfa944def
+0, 121288, 121288, 1378, 2756, 0xc12f23b2
+0, 122666, 122666, 1378, 2756, 0x5ea325a2
+0, 124044, 124044, 1378, 2756, 0x2b245824
+0, 125422, 125422, 1380, 2760, 0x90ac533e
+0, 126802, 126802, 1378, 2756, 0xcca34d26
+0, 128180, 128180, 1378, 2756, 0xb5f820d0
+0, 129558, 129558, 1378, 2756, 0x27f24335
+0, 130936, 130936, 1378, 2756, 0x4a9e87b7
+0, 132314, 132314, 1378, 2756, 0xbd076129
+0, 133692, 133692, 1378, 2756, 0x2e0e3f2e
+0, 135070, 135070, 1380, 2760, 0xdf534478
+0, 136450, 136450, 1378, 2756, 0xca000a2e
+0, 137828, 137828, 1378, 2756, 0x87472df3
+0, 139206, 139206, 1378, 2756, 0x16733810
+0, 140584, 140584, 1378, 2756, 0xfa0734b4
+0, 141962, 141962, 1378, 2756, 0x5eff3fc4
+0, 143340, 143340, 1378, 2756, 0xf35346bd
+0, 144718, 144718, 1378, 2756, 0xac6411c5
+0, 146096, 146096, 1380, 2760, 0x478c3c56
+0, 147476, 147476, 1378, 2756, 0xebd30bdd
+0, 148854, 148854, 1378, 2756, 0xaef95a31
+0, 150232, 150232, 1378, 2756, 0x8aad29d1
+0, 151610, 151610, 1378, 2756, 0x626863f0
+0, 152988, 152988, 1378, 2756, 0x68c05707
+0, 154366, 154366, 1378, 2756, 0x437c5e8d
+0, 155744, 155744, 1380, 2760, 0x8eca4bdb
+0, 157124, 157124, 1378, 2756, 0x62bd4162
+0, 158502, 158502, 1378, 2756, 0x9f744aa4
+0, 159880, 159880, 1378, 2756, 0x0f3f6409
+0, 161258, 161258, 1378, 2756, 0x3fee827a
+0, 162636, 162636, 1378, 2756, 0x48a0ac19
+0, 164014, 164014, 1378, 2756, 0x8e4ce0d0
+0, 165392, 165392, 1380, 2760, 0xcda82236
+0, 166772, 166772, 1378, 2756, 0x0e523255
+0, 168150, 168150, 1378, 2756, 0x84103d30
+0, 169528, 169528, 1378, 2756, 0x13941cde
+0, 170906, 170906, 1378, 2756, 0x9fc834c5
+0, 172284, 172284, 1378, 2756, 0xc0217a77
+0, 173662, 173662, 1378, 2756, 0x3f643659
+0, 175040, 175040, 1380, 2760, 0x9dbd6002
+0, 176420, 176420, 1378, 2756, 0x94f046fb
+0, 177798, 177798, 1378, 2756, 0xab01fb12
+0, 179176, 179176, 1378, 2756, 0x04cffe5c
+0, 180554, 180554, 1378, 2756, 0xef661c5e
+0, 181932, 181932, 1378, 2756, 0x094c5fc5
+0, 183310, 183310, 1378, 2756, 0xe0c1486a
+0, 184688, 184688, 1380, 2760, 0x8c3535b7
+0, 186068, 186068, 1378, 2756, 0x594934aa
+0, 187446, 187446, 1378, 2756, 0x74007238
+0, 188824, 188824, 1378, 2756, 0x61f1394d
+0, 190202, 190202, 1378, 2756, 0x72584f07
+0, 191580, 191580, 1378, 2756, 0xced9acf9
+0, 192958, 192958, 1378, 2756, 0x7d2e3ea1
+0, 194336, 194336, 1378, 2756, 0x56c06897
+0, 195714, 195714, 1380, 2760, 0x19983bbf
+0, 197094, 197094, 1378, 2756, 0x4f884f27
+0, 198472, 198472, 1378, 2756, 0x81ab2f63
+0, 199850, 199850, 1378, 2756, 0x448e681d
+0, 201228, 201228, 1378, 2756, 0x0ba9826e
+0, 202606, 202606, 1378, 2756, 0x049f36fa
+0, 203984, 203984, 1378, 2756, 0x096a2b62
+0, 205362, 205362, 1380, 2760, 0x579e2035
+0, 206742, 206742, 1378, 2756, 0xd13e30e1
+0, 208120, 208120, 1378, 2756, 0x30b6412b
+0, 209498, 209498, 1378, 2756, 0xbb1c3268
+0, 210876, 210876, 1378, 2756, 0xbc175b6a
+0, 212254, 212254, 1378, 2756, 0xf8d160e2
+0, 213632, 213632, 1378, 2756, 0xc1048154
+0, 215010, 215010, 1380, 2760, 0xb83548f4
+0, 216390, 216390, 1378, 2756, 0x22647962
+0, 217768, 217768, 1378, 2756, 0x14ca54d3
+0, 219146, 219146, 1378, 2756, 0x58754b3a
diff --git a/tests/ref/fate/adpcm-ima-smjpeg b/tests/ref/fate/adpcm-ima-smjpeg
index 45cb97bfc1..ed88debc17 100644
--- a/tests/ref/fate/adpcm-ima-smjpeg
+++ b/tests/ref/fate/adpcm-ima-smjpeg
@@ -1,351 +1,351 @@
#tb 0: 1/22050
0, 0, 0, 512, 1024, 0x00000000
-0, 507, 507, 512, 1024, 0x00000000
-0, 1014, 1014, 512, 1024, 0xd89a448e
-0, 1521, 1521, 512, 1024, 0x695b369c
-0, 2029, 2029, 512, 1024, 0xc8ba5707
-0, 2558, 2558, 512, 1024, 0xdf241fc6
-0, 3065, 3065, 512, 1024, 0x61cf4166
-0, 3572, 3572, 512, 1024, 0x97cbc386
-0, 4079, 4079, 512, 1024, 0x44899d04
-0, 4586, 4586, 512, 1024, 0xa7cbaa62
-0, 5116, 5116, 512, 1024, 0xa7aea60c
-0, 5623, 5623, 512, 1024, 0xd7b18a89
-0, 6130, 6130, 512, 1024, 0x268e81f6
-0, 6637, 6637, 512, 1024, 0x9cf83a2f
-0, 7166, 7166, 512, 1024, 0x5559b508
-0, 7673, 7673, 512, 1024, 0xe1b9e71c
-0, 8181, 8181, 512, 1024, 0xdcee733e
-0, 8688, 8688, 512, 1024, 0xe5918f60
-0, 9195, 9195, 512, 1024, 0x29dbd209
-0, 9724, 9724, 512, 1024, 0x9bcbcf16
-0, 10231, 10231, 512, 1024, 0x86f5f458
-0, 10738, 10738, 512, 1024, 0xabcbda86
-0, 11246, 11246, 512, 1024, 0xc51f77b9
-0, 11775, 11775, 512, 1024, 0xf6b3a504
-0, 12282, 12282, 512, 1024, 0x1af3e40e
-0, 12789, 12789, 512, 1024, 0x3866b03b
-0, 13296, 13296, 512, 1024, 0xbc005403
-0, 13803, 13803, 512, 1024, 0xe9dfcc51
-0, 14333, 14333, 512, 1024, 0x83c837cb
-0, 14840, 14840, 512, 1024, 0xfa649580
-0, 15347, 15347, 512, 1024, 0x519452ea
-0, 15854, 15854, 512, 1024, 0xd4978774
-0, 16383, 16383, 512, 1024, 0xe2a3b1cd
-0, 16890, 16890, 512, 1024, 0x9a9472ad
-0, 17397, 17397, 512, 1024, 0xa12d4060
-0, 17905, 17905, 512, 1024, 0x31fb0646
-0, 18412, 18412, 512, 1024, 0xfc44343f
-0, 18941, 18941, 512, 1024, 0x0847751a
-0, 19448, 19448, 512, 1024, 0x227968a2
-0, 19955, 19955, 512, 1024, 0x7cce9f1c
-0, 20462, 20462, 512, 1024, 0xb8356713
-0, 20992, 20992, 512, 1024, 0xb29f6e6f
-0, 21499, 21499, 512, 1024, 0x9e1430ab
+0, 512, 512, 512, 1024, 0x00000000
+0, 1024, 1024, 512, 1024, 0xd89a448e
+0, 1533, 1533, 512, 1024, 0x695b369c
+0, 2040, 2040, 512, 1024, 0xc8ba5707
+0, 2552, 2552, 512, 1024, 0xdf241fc6
+0, 3064, 3064, 512, 1024, 0x61cf4166
+0, 3576, 3576, 512, 1024, 0x97cbc386
+0, 4088, 4088, 512, 1024, 0x44899d04
+0, 4598, 4598, 512, 1024, 0xa7cbaa62
+0, 5110, 5110, 512, 1024, 0xa7aea60c
+0, 5622, 5622, 512, 1024, 0xd7b18a89
+0, 6134, 6134, 512, 1024, 0x268e81f6
+0, 6646, 6646, 512, 1024, 0x9cf83a2f
+0, 7158, 7158, 512, 1024, 0x5559b508
+0, 7670, 7670, 512, 1024, 0xe1b9e71c
+0, 8182, 8182, 512, 1024, 0xdcee733e
+0, 8694, 8694, 512, 1024, 0xe5918f60
+0, 9206, 9206, 512, 1024, 0x29dbd209
+0, 9718, 9718, 512, 1024, 0x9bcbcf16
+0, 10230, 10230, 512, 1024, 0x86f5f458
+0, 10742, 10742, 512, 1024, 0xabcbda86
+0, 11254, 11254, 512, 1024, 0xc51f77b9
+0, 11766, 11766, 512, 1024, 0xf6b3a504
+0, 12278, 12278, 512, 1024, 0x1af3e40e
+0, 12790, 12790, 512, 1024, 0x3866b03b
+0, 13302, 13302, 512, 1024, 0xbc005403
+0, 13814, 13814, 512, 1024, 0xe9dfcc51
+0, 14326, 14326, 512, 1024, 0x83c837cb
+0, 14838, 14838, 512, 1024, 0xfa649580
+0, 15350, 15350, 512, 1024, 0x519452ea
+0, 15862, 15862, 512, 1024, 0xd4978774
+0, 16374, 16374, 512, 1024, 0xe2a3b1cd
+0, 16886, 16886, 512, 1024, 0x9a9472ad
+0, 17398, 17398, 512, 1024, 0xa12d4060
+0, 17910, 17910, 512, 1024, 0x31fb0646
+0, 18422, 18422, 512, 1024, 0xfc44343f
+0, 18934, 18934, 512, 1024, 0x0847751a
+0, 19446, 19446, 512, 1024, 0x227968a2
+0, 19958, 19958, 512, 1024, 0x7cce9f1c
+0, 20470, 20470, 512, 1024, 0xb8356713
+0, 20982, 20982, 512, 1024, 0xb29f6e6f
+0, 21494, 21494, 512, 1024, 0x9e1430ab
0, 22006, 22006, 512, 1024, 0x26d85423
-0, 22513, 22513, 512, 1024, 0x6496547d
-0, 23020, 23020, 512, 1024, 0x316b1a86
-0, 23549, 23549, 512, 1024, 0x3cd83afc
-0, 24057, 24057, 512, 1024, 0x993ff633
-0, 24564, 24564, 512, 1024, 0x0708d1a2
-0, 25071, 25071, 512, 1024, 0xd7230db9
-0, 25578, 25578, 512, 1024, 0xbb0779ca
-0, 26107, 26107, 512, 1024, 0xc6094e1b
+0, 22518, 22518, 512, 1024, 0x6496547d
+0, 23030, 23030, 512, 1024, 0x316b1a86
+0, 23542, 23542, 512, 1024, 0x3cd83afc
+0, 24054, 24054, 512, 1024, 0x993ff633
+0, 24566, 24566, 512, 1024, 0x0708d1a2
+0, 25078, 25078, 512, 1024, 0xd7230db9
+0, 25590, 25590, 512, 1024, 0xbb0779ca
+0, 26102, 26102, 512, 1024, 0xc6094e1b
0, 26614, 26614, 512, 1024, 0x15a8b039
-0, 27122, 27122, 512, 1024, 0xd6dbe88c
-0, 27629, 27629, 512, 1024, 0x7e8d1140
-0, 28158, 28158, 512, 1024, 0xef88e525
-0, 28665, 28665, 512, 1024, 0x44e21149
-0, 29172, 29172, 512, 1024, 0x65b0f5f4
-0, 29679, 29679, 512, 1024, 0xb955f687
-0, 30186, 30186, 512, 1024, 0xc85fba9c
-0, 30716, 30716, 512, 1024, 0xf59655ad
-0, 31223, 31223, 512, 1024, 0x6de80bf1
-0, 31730, 31730, 512, 1024, 0x2dcf6e41
-0, 32237, 32237, 512, 1024, 0xd0ddcf8a
-0, 32766, 32766, 512, 1024, 0x00135c2d
-0, 33273, 33273, 512, 1024, 0x697f8efd
-0, 33781, 33781, 512, 1024, 0x7a9bada5
-0, 34288, 34288, 512, 1024, 0x0d22783c
-0, 34795, 34795, 512, 1024, 0x7726d07d
-0, 35324, 35324, 512, 1024, 0xa2f14f67
-0, 35831, 35831, 512, 1024, 0x7f51060d
-0, 36338, 36338, 512, 1024, 0xc4ec6aea
-0, 36846, 36846, 512, 1024, 0x9bb37ca4
-0, 37375, 37375, 512, 1024, 0x9b085577
-0, 37882, 37882, 512, 1024, 0x8812f8af
-0, 38389, 38389, 512, 1024, 0x788f5221
-0, 38896, 38896, 512, 1024, 0x3a2ce642
-0, 39403, 39403, 512, 1024, 0x72415692
-0, 39933, 39933, 512, 1024, 0xe3dcc105
-0, 40440, 40440, 512, 1024, 0xb26c0599
-0, 40947, 40947, 512, 1024, 0x5c9e55eb
-0, 41454, 41454, 512, 1024, 0x8fe88707
-0, 41983, 41983, 512, 1024, 0xc5d7beb6
-0, 42490, 42490, 512, 1024, 0xe1d3a3b4
+0, 27126, 27126, 512, 1024, 0xd6dbe88c
+0, 27638, 27638, 512, 1024, 0x7e8d1140
+0, 28150, 28150, 512, 1024, 0xef88e525
+0, 28662, 28662, 512, 1024, 0x44e21149
+0, 29174, 29174, 512, 1024, 0x65b0f5f4
+0, 29686, 29686, 512, 1024, 0xb955f687
+0, 30198, 30198, 512, 1024, 0xc85fba9c
+0, 30710, 30710, 512, 1024, 0xf59655ad
+0, 31222, 31222, 512, 1024, 0x6de80bf1
+0, 31734, 31734, 512, 1024, 0x2dcf6e41
+0, 32246, 32246, 512, 1024, 0xd0ddcf8a
+0, 32758, 32758, 512, 1024, 0x00135c2d
+0, 33270, 33270, 512, 1024, 0x697f8efd
+0, 33782, 33782, 512, 1024, 0x7a9bada5
+0, 34294, 34294, 512, 1024, 0x0d22783c
+0, 34806, 34806, 512, 1024, 0x7726d07d
+0, 35318, 35318, 512, 1024, 0xa2f14f67
+0, 35830, 35830, 512, 1024, 0x7f51060d
+0, 36342, 36342, 512, 1024, 0xc4ec6aea
+0, 36854, 36854, 512, 1024, 0x9bb37ca4
+0, 37366, 37366, 512, 1024, 0x9b085577
+0, 37878, 37878, 512, 1024, 0x8812f8af
+0, 38390, 38390, 512, 1024, 0x788f5221
+0, 38902, 38902, 512, 1024, 0x3a2ce642
+0, 39414, 39414, 512, 1024, 0x72415692
+0, 39926, 39926, 512, 1024, 0xe3dcc105
+0, 40438, 40438, 512, 1024, 0xb26c0599
+0, 40950, 40950, 512, 1024, 0x5c9e55eb
+0, 41462, 41462, 512, 1024, 0x8fe88707
+0, 41974, 41974, 512, 1024, 0xc5d7beb6
+0, 42486, 42486, 512, 1024, 0xe1d3a3b4
0, 42998, 42998, 512, 1024, 0x012da0c6
-0, 43505, 43505, 512, 1024, 0x8d010922
-0, 44012, 44012, 512, 1024, 0x3366eb0d
-0, 44541, 44541, 512, 1024, 0xc9381a27
-0, 45048, 45048, 512, 1024, 0x0774f685
-0, 45555, 45555, 512, 1024, 0xc5cae0a5
-0, 46062, 46062, 512, 1024, 0xa6f4737c
-0, 46592, 46592, 512, 1024, 0x8fb6d0d1
-0, 47099, 47099, 512, 1024, 0x05f579c2
+0, 43510, 43510, 512, 1024, 0x8d010922
+0, 44022, 44022, 512, 1024, 0x3366eb0d
+0, 44534, 44534, 512, 1024, 0xc9381a27
+0, 45046, 45046, 512, 1024, 0x0774f685
+0, 45558, 45558, 512, 1024, 0xc5cae0a5
+0, 46070, 46070, 512, 1024, 0xa6f4737c
+0, 46582, 46582, 512, 1024, 0x8fb6d0d1
+0, 47094, 47094, 512, 1024, 0x05f579c2
0, 47606, 47606, 512, 1024, 0x56905d99
-0, 48113, 48113, 512, 1024, 0x002ee18d
-0, 48620, 48620, 512, 1024, 0xeb37ef51
-0, 49149, 49149, 512, 1024, 0x38025635
-0, 49657, 49657, 512, 1024, 0x4fe643c8
-0, 50164, 50164, 512, 1024, 0x11d66ab1
-0, 50671, 50671, 512, 1024, 0xcc3051e9
-0, 51178, 51178, 512, 1024, 0xcd93e854
-0, 51707, 51707, 512, 1024, 0x38f1196d
+0, 48118, 48118, 512, 1024, 0x002ee18d
+0, 48630, 48630, 512, 1024, 0xeb37ef51
+0, 49142, 49142, 512, 1024, 0x38025635
+0, 49654, 49654, 512, 1024, 0x4fe643c8
+0, 50166, 50166, 512, 1024, 0x11d66ab1
+0, 50678, 50678, 512, 1024, 0xcc3051e9
+0, 51190, 51190, 512, 1024, 0xcd93e854
+0, 51702, 51702, 512, 1024, 0x38f1196d
0, 52214, 52214, 512, 1024, 0x657a15fc
-0, 52722, 52722, 512, 1024, 0x669ce2a9
-0, 53229, 53229, 512, 1024, 0x95862dda
-0, 53758, 53758, 512, 1024, 0x1726a7b2
-0, 54265, 54265, 512, 1024, 0xd6ece2a1
-0, 54772, 54772, 512, 1024, 0x33ab9553
-0, 55279, 55279, 512, 1024, 0xd50c73a6
-0, 55787, 55787, 512, 1024, 0xfe25b63a
-0, 56316, 56316, 512, 1024, 0x7e2959e3
-0, 56823, 56823, 512, 1024, 0xa4c07b34
-0, 57330, 57330, 512, 1024, 0xd6d8f15c
-0, 57837, 57837, 512, 1024, 0x1eccddd7
-0, 58366, 58366, 512, 1024, 0x2b69f9cb
-0, 58874, 58874, 512, 1024, 0x667b775f
-0, 59381, 59381, 512, 1024, 0xad3b84e9
-0, 59888, 59888, 512, 1024, 0x4f29fc67
-0, 60395, 60395, 512, 1024, 0x8d611ab7
-0, 60924, 60924, 512, 1024, 0x278966ea
-0, 61431, 61431, 512, 1024, 0xaf33812b
-0, 61938, 61938, 512, 1024, 0xa55f4265
-0, 62446, 62446, 512, 1024, 0x023cb51c
-0, 62975, 62975, 512, 1024, 0x1d1f1005
-0, 63482, 63482, 512, 1024, 0x874cccf7
-0, 63989, 63989, 512, 1024, 0xda705428
-0, 64496, 64496, 512, 1024, 0x48d9b440
-0, 65003, 65003, 512, 1024, 0xa14e0712
-0, 65533, 65533, 512, 1024, 0x7efbad1f
-0, 66040, 66040, 512, 1024, 0xdb82c17f
-0, 66547, 66547, 512, 1024, 0xcbe87613
-0, 67054, 67054, 512, 1024, 0x3a63df1d
-0, 67583, 67583, 512, 1024, 0xd5636bba
-0, 68090, 68090, 512, 1024, 0x9397af23
+0, 52726, 52726, 512, 1024, 0x669ce2a9
+0, 53238, 53238, 512, 1024, 0x95862dda
+0, 53750, 53750, 512, 1024, 0x1726a7b2
+0, 54262, 54262, 512, 1024, 0xd6ece2a1
+0, 54774, 54774, 512, 1024, 0x33ab9553
+0, 55286, 55286, 512, 1024, 0xd50c73a6
+0, 55798, 55798, 512, 1024, 0xfe25b63a
+0, 56310, 56310, 512, 1024, 0x7e2959e3
+0, 56822, 56822, 512, 1024, 0xa4c07b34
+0, 57334, 57334, 512, 1024, 0xd6d8f15c
+0, 57846, 57846, 512, 1024, 0x1eccddd7
+0, 58358, 58358, 512, 1024, 0x2b69f9cb
+0, 58870, 58870, 512, 1024, 0x667b775f
+0, 59382, 59382, 512, 1024, 0xad3b84e9
+0, 59894, 59894, 512, 1024, 0x4f29fc67
+0, 60406, 60406, 512, 1024, 0x8d611ab7
+0, 60918, 60918, 512, 1024, 0x278966ea
+0, 61430, 61430, 512, 1024, 0xaf33812b
+0, 61942, 61942, 512, 1024, 0xa55f4265
+0, 62454, 62454, 512, 1024, 0x023cb51c
+0, 62966, 62966, 512, 1024, 0x1d1f1005
+0, 63478, 63478, 512, 1024, 0x874cccf7
+0, 63990, 63990, 512, 1024, 0xda705428
+0, 64502, 64502, 512, 1024, 0x48d9b440
+0, 65014, 65014, 512, 1024, 0xa14e0712
+0, 65526, 65526, 512, 1024, 0x7efbad1f
+0, 66038, 66038, 512, 1024, 0xdb82c17f
+0, 66550, 66550, 512, 1024, 0xcbe87613
+0, 67062, 67062, 512, 1024, 0x3a63df1d
+0, 67574, 67574, 512, 1024, 0xd5636bba
+0, 68086, 68086, 512, 1024, 0x9397af23
0, 68598, 68598, 512, 1024, 0x32a07c98
-0, 69105, 69105, 512, 1024, 0x202ca667
-0, 69612, 69612, 512, 1024, 0xdf969011
-0, 70141, 70141, 512, 1024, 0xc434d238
-0, 70648, 70648, 512, 1024, 0xe9ad7562
-0, 71155, 71155, 512, 1024, 0xb51b6b50
-0, 71663, 71663, 512, 1024, 0xe70aecd3
-0, 72192, 72192, 512, 1024, 0x03c816b2
-0, 72699, 72699, 512, 1024, 0x869fdf25
+0, 69110, 69110, 512, 1024, 0x202ca667
+0, 69622, 69622, 512, 1024, 0xdf969011
+0, 70134, 70134, 512, 1024, 0xc434d238
+0, 70646, 70646, 512, 1024, 0xe9ad7562
+0, 71158, 71158, 512, 1024, 0xb51b6b50
+0, 71670, 71670, 512, 1024, 0xe70aecd3
+0, 72182, 72182, 512, 1024, 0x03c816b2
+0, 72694, 72694, 512, 1024, 0x869fdf25
0, 73206, 73206, 512, 1024, 0xd40a0a62
-0, 73713, 73713, 512, 1024, 0x5af7dd35
-0, 74220, 74220, 512, 1024, 0x891ffc72
-0, 74750, 74750, 512, 1024, 0x1ff68a08
-0, 75257, 75257, 512, 1024, 0x5a7517a9
-0, 75764, 75764, 512, 1024, 0x0f959f74
-0, 76271, 76271, 512, 1024, 0xe92a12a2
-0, 76778, 76778, 512, 1024, 0x38000e55
-0, 77307, 77307, 512, 1024, 0x39fbdd70
+0, 73718, 73718, 512, 1024, 0x5af7dd35
+0, 74230, 74230, 512, 1024, 0x891ffc72
+0, 74742, 74742, 512, 1024, 0x1ff68a08
+0, 75254, 75254, 512, 1024, 0x5a7517a9
+0, 75766, 75766, 512, 1024, 0x0f959f74
+0, 76278, 76278, 512, 1024, 0xe92a12a2
+0, 76790, 76790, 512, 1024, 0x38000e55
+0, 77302, 77302, 512, 1024, 0x39fbdd70
0, 77814, 77814, 512, 1024, 0xca3d9184
-0, 78322, 78322, 512, 1024, 0x66c8995b
-0, 78829, 78829, 512, 1024, 0xac25acea
-0, 79358, 79358, 512, 1024, 0x3cd1046c
-0, 79865, 79865, 512, 1024, 0x6a1df31c
-0, 80372, 80372, 512, 1024, 0x21ca10a1
-0, 80879, 80879, 512, 1024, 0x1aeccedc
-0, 81387, 81387, 512, 1024, 0xddea1335
-0, 81916, 81916, 512, 1024, 0x19f5ca9f
-0, 82423, 82423, 512, 1024, 0x88e95e43
-0, 82930, 82930, 512, 1024, 0x726284fe
-0, 83437, 83437, 512, 1024, 0x6b85b40e
-0, 83966, 83966, 512, 1024, 0x111fee2a
-0, 84474, 84474, 512, 1024, 0x3656b588
-0, 84981, 84981, 512, 1024, 0xa5a2b552
-0, 85488, 85488, 512, 1024, 0x38fb2467
-0, 85995, 85995, 512, 1024, 0xaa919ccc
-0, 86524, 86524, 512, 1024, 0x15993dbc
-0, 87031, 87031, 512, 1024, 0xbe01a7b9
-0, 87539, 87539, 512, 1024, 0xefe93c09
-0, 88046, 88046, 512, 1024, 0x1bb566e5
-0, 88575, 88575, 512, 1024, 0x15ce6237
-0, 89082, 89082, 512, 1024, 0xa8552e66
-0, 89589, 89589, 512, 1024, 0x9d80187e
-0, 90096, 90096, 512, 1024, 0x5df3fc30
-0, 90603, 90603, 512, 1024, 0x1a312aa5
-0, 91133, 91133, 512, 1024, 0x6bb8e302
-0, 91640, 91640, 512, 1024, 0xbd9684bb
-0, 92147, 92147, 512, 1024, 0x78b0b166
-0, 92654, 92654, 512, 1024, 0xd9af5eae
-0, 93183, 93183, 512, 1024, 0xdb90fe82
-0, 93690, 93690, 512, 1024, 0x327614e9
+0, 78326, 78326, 512, 1024, 0x66c8995b
+0, 78838, 78838, 512, 1024, 0xac25acea
+0, 79350, 79350, 512, 1024, 0x3cd1046c
+0, 79862, 79862, 512, 1024, 0x6a1df31c
+0, 80374, 80374, 512, 1024, 0x21ca10a1
+0, 80886, 80886, 512, 1024, 0x1aeccedc
+0, 81398, 81398, 512, 1024, 0xddea1335
+0, 81910, 81910, 512, 1024, 0x19f5ca9f
+0, 82422, 82422, 512, 1024, 0x88e95e43
+0, 82934, 82934, 512, 1024, 0x726284fe
+0, 83446, 83446, 512, 1024, 0x6b85b40e
+0, 83958, 83958, 512, 1024, 0x111fee2a
+0, 84470, 84470, 512, 1024, 0x3656b588
+0, 84982, 84982, 512, 1024, 0xa5a2b552
+0, 85494, 85494, 512, 1024, 0x38fb2467
+0, 86006, 86006, 512, 1024, 0xaa919ccc
+0, 86518, 86518, 512, 1024, 0x15993dbc
+0, 87030, 87030, 512, 1024, 0xbe01a7b9
+0, 87542, 87542, 512, 1024, 0xefe93c09
+0, 88054, 88054, 512, 1024, 0x1bb566e5
+0, 88566, 88566, 512, 1024, 0x15ce6237
+0, 89078, 89078, 512, 1024, 0xa8552e66
+0, 89590, 89590, 512, 1024, 0x9d80187e
+0, 90102, 90102, 512, 1024, 0x5df3fc30
+0, 90614, 90614, 512, 1024, 0x1a312aa5
+0, 91126, 91126, 512, 1024, 0x6bb8e302
+0, 91638, 91638, 512, 1024, 0xbd9684bb
+0, 92150, 92150, 512, 1024, 0x78b0b166
+0, 92662, 92662, 512, 1024, 0xd9af5eae
+0, 93174, 93174, 512, 1024, 0xdb90fe82
+0, 93686, 93686, 512, 1024, 0x327614e9
0, 94198, 94198, 512, 1024, 0x1f19b7fe
-0, 94705, 94705, 512, 1024, 0x46c53f96
-0, 95212, 95212, 512, 1024, 0x921b2189
-0, 95741, 95741, 512, 1024, 0xa8fbc85a
-0, 96248, 96248, 512, 1024, 0xabfdaaae
-0, 96755, 96755, 512, 1024, 0x6acc7387
-0, 97263, 97263, 512, 1024, 0x0d9c27b5
-0, 97792, 97792, 512, 1024, 0xba4dd809
-0, 98299, 98299, 512, 1024, 0x2a2ad521
+0, 94710, 94710, 512, 1024, 0x46c53f96
+0, 95222, 95222, 512, 1024, 0x921b2189
+0, 95734, 95734, 512, 1024, 0xa8fbc85a
+0, 96246, 96246, 512, 1024, 0xabfdaaae
+0, 96758, 96758, 512, 1024, 0x6acc7387
+0, 97270, 97270, 512, 1024, 0x0d9c27b5
+0, 97782, 97782, 512, 1024, 0xba4dd809
+0, 98294, 98294, 512, 1024, 0x2a2ad521
0, 98806, 98806, 512, 1024, 0x892de38a
-0, 99313, 99313, 512, 1024, 0xdc97a2eb
-0, 99820, 99820, 512, 1024, 0x4f614ca4
-0, 100350, 100350, 512, 1024, 0x9c8a77ea
-0, 100857, 100857, 512, 1024, 0x2d30e646
-0, 101364, 101364, 512, 1024, 0x74e800a7
-0, 101871, 101871, 512, 1024, 0x1e01fb02
-0, 102378, 102378, 512, 1024, 0x4ed2c1d8
-0, 102907, 102907, 512, 1024, 0xf2fdbe63
-0, 103415, 103415, 512, 1024, 0x8d6f63a1
-0, 103922, 103922, 512, 1024, 0xded468d9
-0, 104429, 104429, 512, 1024, 0xccad839e
-0, 104958, 104958, 512, 1024, 0xdde7c082
-0, 105465, 105465, 512, 1024, 0x548613c5
-0, 105972, 105972, 512, 1024, 0x383909bd
-0, 106479, 106479, 512, 1024, 0xfd37627b
-0, 106987, 106987, 512, 1024, 0x6d95a481
-0, 107516, 107516, 512, 1024, 0x56aa87fa
-0, 108023, 108023, 512, 1024, 0x7b67258c
-0, 108530, 108530, 512, 1024, 0x7dd99a92
-0, 109037, 109037, 512, 1024, 0x4a66d102
-0, 109566, 109566, 512, 1024, 0x7b3fce51
-0, 110074, 110074, 512, 1024, 0xbbd968aa
-0, 110581, 110581, 512, 1024, 0x8283ec36
-0, 111088, 111088, 512, 1024, 0x3c96493d
-0, 111595, 111595, 512, 1024, 0xfa4f8cf8
-0, 112124, 112124, 512, 1024, 0xe2cf872d
-0, 112631, 112631, 512, 1024, 0x0a9e7aa6
-0, 113139, 113139, 512, 1024, 0x6e7a0550
-0, 113646, 113646, 512, 1024, 0x3acfea2f
-0, 114175, 114175, 512, 1024, 0x7111d0fa
-0, 114682, 114682, 512, 1024, 0xe9a1eca9
-0, 115189, 115189, 512, 1024, 0x24da6c46
-0, 115696, 115696, 512, 1024, 0x117cff37
-0, 116204, 116204, 512, 1024, 0x0f27cab6
-0, 116733, 116733, 512, 1024, 0x69b6b4e6
-0, 117240, 117240, 512, 1024, 0x1e6cc841
-0, 117747, 117747, 512, 1024, 0xb01e2365
-0, 118254, 118254, 512, 1024, 0x14e200d3
-0, 118783, 118783, 512, 1024, 0xd1184c98
-0, 119291, 119291, 512, 1024, 0xef9140e9
+0, 99318, 99318, 512, 1024, 0xdc97a2eb
+0, 99830, 99830, 512, 1024, 0x4f614ca4
+0, 100342, 100342, 512, 1024, 0x9c8a77ea
+0, 100854, 100854, 512, 1024, 0x2d30e646
+0, 101366, 101366, 512, 1024, 0x74e800a7
+0, 101878, 101878, 512, 1024, 0x1e01fb02
+0, 102390, 102390, 512, 1024, 0x4ed2c1d8
+0, 102902, 102902, 512, 1024, 0xf2fdbe63
+0, 103414, 103414, 512, 1024, 0x8d6f63a1
+0, 103926, 103926, 512, 1024, 0xded468d9
+0, 104438, 104438, 512, 1024, 0xccad839e
+0, 104950, 104950, 512, 1024, 0xdde7c082
+0, 105462, 105462, 512, 1024, 0x548613c5
+0, 105974, 105974, 512, 1024, 0x383909bd
+0, 106486, 106486, 512, 1024, 0xfd37627b
+0, 106998, 106998, 512, 1024, 0x6d95a481
+0, 107510, 107510, 512, 1024, 0x56aa87fa
+0, 108022, 108022, 512, 1024, 0x7b67258c
+0, 108534, 108534, 512, 1024, 0x7dd99a92
+0, 109046, 109046, 512, 1024, 0x4a66d102
+0, 109558, 109558, 512, 1024, 0x7b3fce51
+0, 110070, 110070, 512, 1024, 0xbbd968aa
+0, 110582, 110582, 512, 1024, 0x8283ec36
+0, 111094, 111094, 512, 1024, 0x3c96493d
+0, 111606, 111606, 512, 1024, 0xfa4f8cf8
+0, 112118, 112118, 512, 1024, 0xe2cf872d
+0, 112630, 112630, 512, 1024, 0x0a9e7aa6
+0, 113142, 113142, 512, 1024, 0x6e7a0550
+0, 113654, 113654, 512, 1024, 0x3acfea2f
+0, 114166, 114166, 512, 1024, 0x7111d0fa
+0, 114678, 114678, 512, 1024, 0xe9a1eca9
+0, 115190, 115190, 512, 1024, 0x24da6c46
+0, 115702, 115702, 512, 1024, 0x117cff37
+0, 116214, 116214, 512, 1024, 0x0f27cab6
+0, 116726, 116726, 512, 1024, 0x69b6b4e6
+0, 117238, 117238, 512, 1024, 0x1e6cc841
+0, 117750, 117750, 512, 1024, 0xb01e2365
+0, 118262, 118262, 512, 1024, 0x14e200d3
+0, 118774, 118774, 512, 1024, 0xd1184c98
+0, 119286, 119286, 512, 1024, 0xef9140e9
0, 119798, 119798, 512, 1024, 0x4cbb645e
-0, 120305, 120305, 512, 1024, 0xe7fe2f06
-0, 120812, 120812, 512, 1024, 0xf8c45028
-0, 121341, 121341, 512, 1024, 0x561358f4
-0, 121848, 121848, 512, 1024, 0xd0129b77
-0, 122355, 122355, 512, 1024, 0xcc636e88
-0, 122863, 122863, 512, 1024, 0xe9406321
-0, 123392, 123392, 512, 1024, 0x9f16a041
-0, 123899, 123899, 512, 1024, 0x468bf409
+0, 120310, 120310, 512, 1024, 0xe7fe2f06
+0, 120822, 120822, 512, 1024, 0xf8c45028
+0, 121334, 121334, 512, 1024, 0x561358f4
+0, 121846, 121846, 512, 1024, 0xd0129b77
+0, 122358, 122358, 512, 1024, 0xcc636e88
+0, 122870, 122870, 512, 1024, 0xe9406321
+0, 123382, 123382, 512, 1024, 0x9f16a041
+0, 123894, 123894, 512, 1024, 0x468bf409
0, 124406, 124406, 512, 1024, 0x3df70f7b
-0, 124913, 124913, 512, 1024, 0xa880b11b
-0, 125420, 125420, 512, 1024, 0x3286c489
-0, 125950, 125950, 512, 1024, 0x39fe9ebc
-0, 126457, 126457, 512, 1024, 0xc533d83b
-0, 126964, 126964, 512, 1024, 0x153b195d
-0, 127471, 127471, 512, 1024, 0xd84786a1
-0, 127978, 127978, 512, 1024, 0xdc295aaa
-0, 128507, 128507, 512, 1024, 0xfb764d8c
-0, 129015, 129015, 512, 1024, 0xeebc9db9
-0, 129522, 129522, 512, 1024, 0x7ba9403e
-0, 130029, 130029, 512, 1024, 0x4e5571ec
-0, 130558, 130558, 512, 1024, 0xd965fad4
-0, 131065, 131065, 512, 1024, 0x87e259f2
-0, 131572, 131572, 512, 1024, 0xae7e533b
-0, 132080, 132080, 512, 1024, 0x313cf4d6
-0, 132587, 132587, 512, 1024, 0xe1844c90
-0, 133116, 133116, 512, 1024, 0xbb057b44
-0, 133623, 133623, 512, 1024, 0xa5099687
-0, 134130, 134130, 512, 1024, 0xbff10707
-0, 134637, 134637, 512, 1024, 0x37c4ffc0
-0, 135167, 135167, 512, 1024, 0xf9fb6caa
-0, 135674, 135674, 512, 1024, 0x3b6a3a1f
-0, 136181, 136181, 512, 1024, 0x83431edb
-0, 136688, 136688, 512, 1024, 0x1eb713cf
-0, 137195, 137195, 512, 1024, 0xd7b07a6d
-0, 137724, 137724, 512, 1024, 0x81ae3391
-0, 138231, 138231, 512, 1024, 0xf150130a
-0, 138739, 138739, 512, 1024, 0x09678eaa
-0, 139246, 139246, 512, 1024, 0xb94e06f1
-0, 139775, 139775, 512, 1024, 0x67b1dbc9
-0, 140282, 140282, 512, 1024, 0xd6edc235
-0, 140789, 140789, 512, 1024, 0x34e4c499
-0, 141296, 141296, 512, 1024, 0xeefd89c0
-0, 141804, 141804, 512, 1024, 0x38afdaf1
-0, 142333, 142333, 512, 1024, 0x29a60d76
-0, 142840, 142840, 512, 1024, 0xe28a4372
-0, 143347, 143347, 512, 1024, 0x7089454d
-0, 143854, 143854, 512, 1024, 0x0c01bb7b
-0, 144383, 144383, 512, 1024, 0xbd776a72
-0, 144891, 144891, 512, 1024, 0x86776fd0
+0, 124918, 124918, 512, 1024, 0xa880b11b
+0, 125430, 125430, 512, 1024, 0x3286c489
+0, 125942, 125942, 512, 1024, 0x39fe9ebc
+0, 126454, 126454, 512, 1024, 0xc533d83b
+0, 126966, 126966, 512, 1024, 0x153b195d
+0, 127478, 127478, 512, 1024, 0xd84786a1
+0, 127990, 127990, 512, 1024, 0xdc295aaa
+0, 128502, 128502, 512, 1024, 0xfb764d8c
+0, 129014, 129014, 512, 1024, 0xeebc9db9
+0, 129526, 129526, 512, 1024, 0x7ba9403e
+0, 130038, 130038, 512, 1024, 0x4e5571ec
+0, 130550, 130550, 512, 1024, 0xd965fad4
+0, 131062, 131062, 512, 1024, 0x87e259f2
+0, 131574, 131574, 512, 1024, 0xae7e533b
+0, 132086, 132086, 512, 1024, 0x313cf4d6
+0, 132598, 132598, 512, 1024, 0xe1844c90
+0, 133110, 133110, 512, 1024, 0xbb057b44
+0, 133622, 133622, 512, 1024, 0xa5099687
+0, 134134, 134134, 512, 1024, 0xbff10707
+0, 134646, 134646, 512, 1024, 0x37c4ffc0
+0, 135158, 135158, 512, 1024, 0xf9fb6caa
+0, 135670, 135670, 512, 1024, 0x3b6a3a1f
+0, 136182, 136182, 512, 1024, 0x83431edb
+0, 136694, 136694, 512, 1024, 0x1eb713cf
+0, 137206, 137206, 512, 1024, 0xd7b07a6d
+0, 137718, 137718, 512, 1024, 0x81ae3391
+0, 138230, 138230, 512, 1024, 0xf150130a
+0, 138742, 138742, 512, 1024, 0x09678eaa
+0, 139254, 139254, 512, 1024, 0xb94e06f1
+0, 139766, 139766, 512, 1024, 0x67b1dbc9
+0, 140278, 140278, 512, 1024, 0xd6edc235
+0, 140790, 140790, 512, 1024, 0x34e4c499
+0, 141302, 141302, 512, 1024, 0xeefd89c0
+0, 141814, 141814, 512, 1024, 0x38afdaf1
+0, 142326, 142326, 512, 1024, 0x29a60d76
+0, 142838, 142838, 512, 1024, 0xe28a4372
+0, 143350, 143350, 512, 1024, 0x7089454d
+0, 143862, 143862, 512, 1024, 0x0c01bb7b
+0, 144374, 144374, 512, 1024, 0xbd776a72
+0, 144886, 144886, 512, 1024, 0x86776fd0
0, 145398, 145398, 512, 1024, 0xb37c88f7
-0, 145905, 145905, 512, 1024, 0x5f90aaf8
-0, 146412, 146412, 512, 1024, 0x203d4222
-0, 146941, 146941, 512, 1024, 0x382692a6
-0, 147448, 147448, 512, 1024, 0xf37c95fd
-0, 147956, 147956, 512, 1024, 0x6c0b8877
-0, 148463, 148463, 512, 1024, 0x2e54a8b6
-0, 148992, 148992, 512, 1024, 0x7f266488
-0, 149499, 149499, 512, 1024, 0xfbf20f9a
+0, 145910, 145910, 512, 1024, 0x5f90aaf8
+0, 146422, 146422, 512, 1024, 0x203d4222
+0, 146934, 146934, 512, 1024, 0x382692a6
+0, 147446, 147446, 512, 1024, 0xf37c95fd
+0, 147958, 147958, 512, 1024, 0x6c0b8877
+0, 148470, 148470, 512, 1024, 0x2e54a8b6
+0, 148982, 148982, 512, 1024, 0x7f266488
+0, 149494, 149494, 512, 1024, 0xfbf20f9a
0, 150006, 150006, 512, 1024, 0xf2985cc0
-0, 150513, 150513, 512, 1024, 0xc7075340
-0, 151020, 151020, 512, 1024, 0xe4585695
-0, 151550, 151550, 512, 1024, 0xbdffa380
-0, 152057, 152057, 512, 1024, 0x2422a8a9
-0, 152564, 152564, 512, 1024, 0x59cbd75f
-0, 153071, 153071, 512, 1024, 0x04ad1a8c
-0, 153578, 153578, 512, 1024, 0x33c09191
-0, 154107, 154107, 512, 1024, 0x55efa6fd
-0, 154615, 154615, 512, 1024, 0xf73d0e5d
-0, 155122, 155122, 512, 1024, 0x6141ebae
-0, 155629, 155629, 512, 1024, 0x7db17a68
-0, 156158, 156158, 512, 1024, 0xa6c690b6
-0, 156665, 156665, 512, 1024, 0xa6fd6725
-0, 157172, 157172, 512, 1024, 0x50a90b9b
-0, 157680, 157680, 512, 1024, 0xef990dc8
-0, 158187, 158187, 512, 1024, 0x75adf6b5
-0, 158716, 158716, 512, 1024, 0x61eac43e
-0, 159223, 159223, 512, 1024, 0x67797a19
-0, 159730, 159730, 512, 1024, 0xf325277a
-0, 160237, 160237, 512, 1024, 0x18bf254a
-0, 160767, 160767, 512, 1024, 0x2ce6bee3
-0, 161274, 161274, 512, 1024, 0x8d320860
-0, 161781, 161781, 512, 1024, 0xc979b6e8
-0, 162288, 162288, 512, 1024, 0xdb644b41
-0, 162795, 162795, 512, 1024, 0xe1b368ba
-0, 163324, 163324, 512, 1024, 0xacc53d15
-0, 163832, 163832, 512, 1024, 0x42ea8c18
-0, 164339, 164339, 512, 1024, 0xe52c99a4
-0, 164846, 164846, 512, 1024, 0xd7db54a6
-0, 165375, 165375, 512, 1024, 0x7f27a7e3
-0, 165882, 165882, 512, 1024, 0xf7ffeaa9
-0, 166389, 166389, 512, 1024, 0x792b6088
-0, 166896, 166896, 512, 1024, 0x61d99724
-0, 167404, 167404, 512, 1024, 0x5213720e
-0, 167933, 167933, 512, 1024, 0xac09dd30
-0, 168440, 168440, 512, 1024, 0x960bf6bb
-0, 168947, 168947, 512, 1024, 0xc90168e1
-0, 169454, 169454, 512, 1024, 0x43b45768
-0, 169983, 169983, 512, 1024, 0x935d60a1
-0, 170491, 170491, 512, 1024, 0x9a342ef2
+0, 150518, 150518, 512, 1024, 0xc7075340
+0, 151030, 151030, 512, 1024, 0xe4585695
+0, 151542, 151542, 512, 1024, 0xbdffa380
+0, 152054, 152054, 512, 1024, 0x2422a8a9
+0, 152566, 152566, 512, 1024, 0x59cbd75f
+0, 153078, 153078, 512, 1024, 0x04ad1a8c
+0, 153590, 153590, 512, 1024, 0x33c09191
+0, 154102, 154102, 512, 1024, 0x55efa6fd
+0, 154614, 154614, 512, 1024, 0xf73d0e5d
+0, 155126, 155126, 512, 1024, 0x6141ebae
+0, 155638, 155638, 512, 1024, 0x7db17a68
+0, 156150, 156150, 512, 1024, 0xa6c690b6
+0, 156662, 156662, 512, 1024, 0xa6fd6725
+0, 157174, 157174, 512, 1024, 0x50a90b9b
+0, 157686, 157686, 512, 1024, 0xef990dc8
+0, 158198, 158198, 512, 1024, 0x75adf6b5
+0, 158710, 158710, 512, 1024, 0x61eac43e
+0, 159222, 159222, 512, 1024, 0x67797a19
+0, 159734, 159734, 512, 1024, 0xf325277a
+0, 160246, 160246, 512, 1024, 0x18bf254a
+0, 160758, 160758, 512, 1024, 0x2ce6bee3
+0, 161270, 161270, 512, 1024, 0x8d320860
+0, 161782, 161782, 512, 1024, 0xc979b6e8
+0, 162294, 162294, 512, 1024, 0xdb644b41
+0, 162806, 162806, 512, 1024, 0xe1b368ba
+0, 163318, 163318, 512, 1024, 0xacc53d15
+0, 163830, 163830, 512, 1024, 0x42ea8c18
+0, 164342, 164342, 512, 1024, 0xe52c99a4
+0, 164854, 164854, 512, 1024, 0xd7db54a6
+0, 165366, 165366, 512, 1024, 0x7f27a7e3
+0, 165878, 165878, 512, 1024, 0xf7ffeaa9
+0, 166390, 166390, 512, 1024, 0x792b6088
+0, 166902, 166902, 512, 1024, 0x61d99724
+0, 167414, 167414, 512, 1024, 0x5213720e
+0, 167926, 167926, 512, 1024, 0xac09dd30
+0, 168438, 168438, 512, 1024, 0x960bf6bb
+0, 168950, 168950, 512, 1024, 0xc90168e1
+0, 169462, 169462, 512, 1024, 0x43b45768
+0, 169974, 169974, 512, 1024, 0x935d60a1
+0, 170486, 170486, 512, 1024, 0x9a342ef2
0, 170998, 170998, 512, 1024, 0xc894709f
-0, 171505, 171505, 512, 1024, 0x59b43b07
-0, 172012, 172012, 512, 1024, 0x36a1a98d
-0, 172541, 172541, 512, 1024, 0x9e1a121c
-0, 173048, 173048, 512, 1024, 0x02208b78
-0, 173556, 173556, 512, 1024, 0xd1d7b274
-0, 174063, 174063, 512, 1024, 0xdacd5096
-0, 174592, 174592, 512, 1024, 0x51b71ead
-0, 175099, 175099, 512, 1024, 0xd009a7ca
+0, 171510, 171510, 512, 1024, 0x59b43b07
+0, 172022, 172022, 512, 1024, 0x36a1a98d
+0, 172534, 172534, 512, 1024, 0x9e1a121c
+0, 173046, 173046, 512, 1024, 0x02208b78
+0, 173558, 173558, 512, 1024, 0xd1d7b274
+0, 174070, 174070, 512, 1024, 0xdacd5096
+0, 174582, 174582, 512, 1024, 0x51b71ead
+0, 175094, 175094, 512, 1024, 0xd009a7ca
0, 175606, 175606, 512, 1024, 0xb6d5a938
-0, 176113, 176113, 512, 1024, 0xf3d45e47
-0, 176621, 176621, 512, 1024, 0xea8e04fc
-0, 177150, 177150, 512, 1024, 0x0b928bd8
-0, 177657, 177657, 512, 1024, 0x0f02caec
-0, 178164, 178164, 512, 1024, 0xe2b137a8
-0, 178671, 178671, 512, 1024, 0xd5f94892
+0, 176118, 176118, 512, 1024, 0xf3d45e47
+0, 176630, 176630, 512, 1024, 0xea8e04fc
+0, 177142, 177142, 512, 1024, 0x0b928bd8
+0, 177654, 177654, 512, 1024, 0x0f02caec
+0, 178166, 178166, 512, 1024, 0xe2b137a8
+0, 178678, 178678, 512, 1024, 0xd5f94892
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index 3572bbeac0..9621491bf3 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -3,7 +3,7 @@ c53c9f7ee2091405fbe50374f9055679 *./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x17ce1069
14d0ac1513840b670a785daf4331aca8 *./tests/data/lavf/lavf.mxf
554553 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/lavf.mxf CRC=0xa3c0dbc4
+./tests/data/lavf/lavf.mxf CRC=0xe11bdbc4
5636cee18b0f34a5acb33a8efb9f80c6 *./tests/data/lavf/lavf.mxf
525369 ./tests/data/lavf/lavf.mxf
./tests/data/lavf/lavf.mxf CRC=0x17ce1069