[FFmpeg-devel] [PATCH] framecrcenc: print flags and side data elements

Michael Niedermayer michaelni at gmx.at
Tue Oct 2 21:23:43 CEST 2012


The new fields are only printed when they differ from their defaults
this way only few fate refs change

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavformat/framecrcenc.c     |    8 +-
 tests/ref/fate/d-cinema-demux |    2 +-
 tests/ref/fate/lmlm4-demux    |  168 +++++++++++------------
 tests/ref/fate/mtv            |    2 +-
 tests/ref/fate/mxf-demux      |  170 +++++++++++------------
 tests/ref/fate/nc-demux       |  176 ++++++++++++------------
 tests/ref/fate/nsv-demux      |  108 +++++++--------
 tests/ref/fate/paf-demux      |  300 ++++++++++++++++++++---------------------
 tests/ref/fate/redcode-demux  |    2 +-
 tests/ref/fate/wmv8-drm-nodec |  256 +++++++++++++++++------------------
 tests/ref/fate/wtv-demux      |   78 +++++------
 tests/ref/fate/xmv-demux      |  174 ++++++++++++------------
 12 files changed, 725 insertions(+), 719 deletions(-)

diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index b17c922..8a69748 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/adler32.h"
+#include "libavutil/avstring.h"
 #include "avformat.h"
 #include "internal.h"
 
@@ -28,8 +29,13 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     uint32_t crc = av_adler32_update(0, pkt->data, pkt->size);
     char buf[256];
 
-    snprintf(buf, sizeof(buf), "%d, %10"PRId64", %10"PRId64", %8d, %8d, 0x%08x\n",
+    snprintf(buf, sizeof(buf), "%d, %10"PRId64", %10"PRId64", %8d, %8d, 0x%08x",
              pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size, crc);
+    if (pkt->flags != AV_PKT_FLAG_KEY)
+        av_strlcatf(buf, sizeof(buf), ", F=0x%0X", pkt->flags);
+    if (pkt->side_data_elems)
+        av_strlcatf(buf, sizeof(buf), ", S=%d", pkt->side_data_elems);
+    av_strlcatf(buf, sizeof(buf), "\n");
     avio_write(s->pb, buf, strlen(buf));
     avio_flush(s->pb);
     return 0;
diff --git a/tests/ref/fate/d-cinema-demux b/tests/ref/fate/d-cinema-demux
index f663040..2f28e46 100644
--- a/tests/ref/fate/d-cinema-demux
+++ b/tests/ref/fate/d-cinema-demux
@@ -2,4 +2,4 @@
 0,          0,          0,     1875,    36000, 0xd592781d
 0,       1875,       1875,     1875,    36000, 0xd592781d
 0,       3750,       3750,     1875,    36000, 0xd592781d
-0,       5625,       5625,     1200,    23056, 0xde81f0d6
+0,       5625,       5625,     1200,    23056, 0xde81f0d6, F=0x3
diff --git a/tests/ref/fate/lmlm4-demux b/tests/ref/fate/lmlm4-demux
index 0546135..f8a6e21 100644
--- a/tests/ref/fate/lmlm4-demux
+++ b/tests/ref/fate/lmlm4-demux
@@ -3,215 +3,215 @@
 0,          0, -9223372036854775808,        1,     5951, 0xe9118e0d
 1,          0,          0,     2160,      768, 0xaebcbebb
 1,       2160,       2160,     2160,      768, 0xaebcbebb
-0,          1, -9223372036854775808,        1,     1672, 0x4b80d4ca
+0,          1, -9223372036854775808,        1,     1672, 0x4b80d4ca, F=0x0
 1,       4320,       4320,     2160,      768, 0xaebcbebb
-0,          2, -9223372036854775808,        1,     1604, 0x99e1b0a7
+0,          2, -9223372036854775808,        1,     1604, 0x99e1b0a7, F=0x0
 1,       6480,       6480,     2160,      768, 0x866fe37a
 1,       8640,       8640,     2160,      768, 0x05d76890
-0,          3, -9223372036854775808,        1,     1204, 0x9559038a
+0,          3, -9223372036854775808,        1,     1204, 0x9559038a, F=0x0
 1,      10800,      10800,     2160,      768, 0x858f5511
-0,          4, -9223372036854775808,        1,     1482, 0x60056564
+0,          4, -9223372036854775808,        1,     1482, 0x60056564, F=0x0
 1,      12960,      12960,     2160,      768, 0x97cb65ef
-0,          5, -9223372036854775808,        1,     1105, 0xf508cef4
+0,          5, -9223372036854775808,        1,     1105, 0xf508cef4, F=0x0
 1,      15120,      15120,     2160,      768, 0xe269742c
 1,      17280,      17280,     2160,      768, 0xa6015f8d
-0,          6, -9223372036854775808,        1,     1193, 0xc8e0fd36
+0,          6, -9223372036854775808,        1,     1193, 0xc8e0fd36, F=0x0
 1,      19440,      19440,     2160,      768, 0x759163e0
-0,          7, -9223372036854775808,        1,     1247, 0x8dd202e5
+0,          7, -9223372036854775808,        1,     1247, 0x8dd202e5, F=0x0
 1,      21600,      21600,     2160,      768, 0xb1e16082
 1,      23760,      23760,     2160,      768, 0x1b616429
-0,          8, -9223372036854775808,        1,     1367, 0xf59435e5
+0,          8, -9223372036854775808,        1,     1367, 0xf59435e5, F=0x0
 1,      25920,      25920,     2160,      768, 0x7e4364f7
-0,          9, -9223372036854775808,        1,     1406, 0x68ba4a7e
+0,          9, -9223372036854775808,        1,     1406, 0x68ba4a7e, F=0x0
 1,      28080,      28080,     2160,      768, 0x59bd64f7
-0,         10, -9223372036854775808,        1,     1262, 0x82c04123
+0,         10, -9223372036854775808,        1,     1262, 0x82c04123, F=0x0
 1,      30240,      30240,     2160,      768, 0xc3116fc6
 1,      32400,      32400,     2160,      768, 0x6a1c6b56
-0,         11, -9223372036854775808,        1,     1381, 0x02335cf9
+0,         11, -9223372036854775808,        1,     1381, 0x02335cf9, F=0x0
 1,      34560,      34560,     2160,      768, 0x285a64cf
-0,         12, -9223372036854775808,        1,     1450, 0x7be46fd1
+0,         12, -9223372036854775808,        1,     1450, 0x7be46fd1, F=0x0
 1,      36720,      36720,     2160,      768, 0x79b16d65
 1,      38880,      38880,     2160,      768, 0x09b47635
-0,         13, -9223372036854775808,        1,     1362, 0x75cc381a
+0,         13, -9223372036854775808,        1,     1362, 0x75cc381a, F=0x0
 1,      41040,      41040,     2160,      768, 0x81597446
-0,         14, -9223372036854775808,        1,     1409, 0x9ed74f3f
+0,         14, -9223372036854775808,        1,     1409, 0x9ed74f3f, F=0x0
 1,      43200,      43200,     2160,      768, 0xfeb66eee
-0,         15, -9223372036854775808,        1,     1253, 0x82400ae1
+0,         15, -9223372036854775808,        1,     1253, 0x82400ae1, F=0x0
 1,      45360,      45360,     2160,      768, 0x78557618
 1,      47520,      47520,     2160,      768, 0x3af170bf
 0,         16, -9223372036854775808,        1,     5499, 0xed286805
 1,      49680,      49680,     2160,      768, 0xefbd6399
-0,         17, -9223372036854775808,        1,     1403, 0x483c4cbc
+0,         17, -9223372036854775808,        1,     1403, 0x483c4cbc, F=0x0
 1,      51840,      51840,     2160,      768, 0xc98e7492
 1,      54000,      54000,     2160,      768, 0x010d7149
-0,         18, -9223372036854775808,        1,     1632, 0xa9ebcd6c
+0,         18, -9223372036854775808,        1,     1632, 0xa9ebcd6c, F=0x0
 1,      56160,      56160,     2160,      768, 0xce838b07
-0,         19, -9223372036854775808,        1,     1207, 0xc8580724
+0,         19, -9223372036854775808,        1,     1207, 0xc8580724, F=0x0
 1,      58320,      58320,     2160,      768, 0xed18726c
-0,         20, -9223372036854775808,        1,     1289, 0x61fb2fd2
+0,         20, -9223372036854775808,        1,     1289, 0x61fb2fd2, F=0x0
 1,      60480,      60480,     2160,      768, 0x017e6712
 1,      62640,      62640,     2160,      768, 0x7f9268e9
-0,         21, -9223372036854775808,        1,     1230, 0xf348f53c
+0,         21, -9223372036854775808,        1,     1230, 0xf348f53c, F=0x0
 1,      64800,      64800,     2160,      768, 0xf6f258fc
-0,         22, -9223372036854775808,        1,     1579, 0xa260b1ac
+0,         22, -9223372036854775808,        1,     1579, 0xa260b1ac, F=0x0
 1,      66960,      66960,     2160,      768, 0x9a1a6f31
-0,         23, -9223372036854775808,        1,      949, 0x91849002
+0,         23, -9223372036854775808,        1,      949, 0x91849002, F=0x0
 1,      69120,      69120,     2160,      768, 0x14b47b23
 1,      71280,      71280,     2160,      768, 0x9bdc6a50
-0,         24, -9223372036854775808,        1,      786, 0x3e33576f
+0,         24, -9223372036854775808,        1,      786, 0x3e33576f, F=0x0
 1,      73440,      73440,     2160,      768, 0x0fc46dab
-0,         25, -9223372036854775808,        1,      894, 0x9ac36a61
+0,         25, -9223372036854775808,        1,      894, 0x9ac36a61, F=0x0
 1,      75600,      75600,     2160,      768, 0x6c387372
 1,      77760,      77760,     2160,      768, 0x581e71cd
-0,         26, -9223372036854775808,        1,     1186, 0x6bfc116e
+0,         26, -9223372036854775808,        1,     1186, 0x6bfc116e, F=0x0
 1,      79920,      79920,     2160,      768, 0x00cb785f
-0,         27, -9223372036854775808,        1,     1187, 0xcfc512ae
+0,         27, -9223372036854775808,        1,     1187, 0xcfc512ae, F=0x0
 1,      82080,      82080,     2160,      768, 0x1dda7032
-0,         28, -9223372036854775808,        1,     1527, 0x5c2c965a
+0,         28, -9223372036854775808,        1,     1527, 0x5c2c965a, F=0x0
 1,      84240,      84240,     2160,      768, 0xf57c7103
 1,      86400,      86400,     2160,      768, 0x2d927183
-0,         29, -9223372036854775808,        1,     1536, 0x5ba7ac29
+0,         29, -9223372036854775808,        1,     1536, 0x5ba7ac29, F=0x0
 1,      88560,      88560,     2160,      768, 0xdae86cdf
-0,         30, -9223372036854775808,        1,     1095, 0xce06eb96
+0,         30, -9223372036854775808,        1,     1095, 0xce06eb96, F=0x0
 1,      90720,      90720,     2160,      768, 0x2a2f6c3c
 1,      92880,      92880,     2160,      768, 0x44696eba
-0,         31, -9223372036854775808,        1,     1402, 0x642f6b0d
+0,         31, -9223372036854775808,        1,     1402, 0x642f6b0d, F=0x0
 1,      95040,      95040,     2160,      768, 0xf67c71c4
 0,         32, -9223372036854775808,        1,     5551, 0xf01a9c08
 1,      97200,      97200,     2160,      768, 0xc1ce7237
-0,         33, -9223372036854775808,        1,     1211, 0x350206f7
+0,         33, -9223372036854775808,        1,     1211, 0x350206f7, F=0x0
 1,      99360,      99360,     2160,      768, 0xd9c36ef5
 1,     101520,     101520,     2160,      768, 0x63b06b03
-0,         34, -9223372036854775808,        1,      887, 0x08767619
+0,         34, -9223372036854775808,        1,      887, 0x08767619, F=0x0
 1,     103680,     103680,     2160,      768, 0x8de97ebe
-0,         35, -9223372036854775808,        1,     1042, 0xcc81a9ed
+0,         35, -9223372036854775808,        1,     1042, 0xcc81a9ed, F=0x0
 1,     105840,     105840,     2160,      768, 0xbf117c32
 1,     108000,     108000,     2160,      768, 0x82897497
-0,         36, -9223372036854775808,        1,     1247, 0x6f320614
+0,         36, -9223372036854775808,        1,     1247, 0x6f320614, F=0x0
 1,     110160,     110160,     2160,      768, 0x7a347abb
-0,         37, -9223372036854775808,        1,     1459, 0xd28975b5
+0,         37, -9223372036854775808,        1,     1459, 0xd28975b5, F=0x0
 1,     112320,     112320,     2160,      768, 0xc99b691e
-0,         38, -9223372036854775808,        1,     1116, 0x1ab1e9db
+0,         38, -9223372036854775808,        1,     1116, 0x1ab1e9db, F=0x0
 1,     114480,     114480,     2160,      768, 0xf4fc6e74
 1,     116640,     116640,     2160,      768, 0x511d6ec4
-0,         39, -9223372036854775808,        1,     1110, 0x6411f66a
+0,         39, -9223372036854775808,        1,     1110, 0x6411f66a, F=0x0
 1,     118800,     118800,     2160,      768, 0xb8c06b5f
-0,         40, -9223372036854775808,        1,     1282, 0xd468375d
+0,         40, -9223372036854775808,        1,     1282, 0xd468375d, F=0x0
 1,     120960,     120960,     2160,      768, 0xf1776aed
 1,     123120,     123120,     2160,      768, 0xe6fe7fb4
-0,         41, -9223372036854775808,        1,     1077, 0x1273c6e3
+0,         41, -9223372036854775808,        1,     1077, 0x1273c6e3, F=0x0
 1,     125280,     125280,     2160,      768, 0x36907aff
-0,         42, -9223372036854775808,        1,     1043, 0x12dbd3ae
+0,         42, -9223372036854775808,        1,     1043, 0x12dbd3ae, F=0x0
 1,     127440,     127440,     2160,      768, 0xddf666bb
-0,         43, -9223372036854775808,        1,     1087, 0x3e70d37a
+0,         43, -9223372036854775808,        1,     1087, 0x3e70d37a, F=0x0
 1,     129600,     129600,     2160,      768, 0x8e896ebc
 1,     131760,     131760,     2160,      768, 0x0aa47dfa
-0,         44, -9223372036854775808,        1,      992, 0x0651a71c
+0,         44, -9223372036854775808,        1,      992, 0x0651a71c, F=0x0
 1,     133920,     133920,     2160,      768, 0xc1736811
-0,         45, -9223372036854775808,        1,     1012, 0x6a069f8c
+0,         45, -9223372036854775808,        1,     1012, 0x6a069f8c, F=0x0
 1,     136080,     136080,     2160,      768, 0xb3e87009
-0,         46, -9223372036854775808,        1,     1320, 0x92803d69
+0,         46, -9223372036854775808,        1,     1320, 0x92803d69, F=0x0
 1,     138240,     138240,     2160,      768, 0xf23e6c00
 1,     140400,     140400,     2160,      768, 0x993a71d2
-0,         47, -9223372036854775808,        1,     1080, 0xe0ffbe95
+0,         47, -9223372036854775808,        1,     1080, 0xe0ffbe95, F=0x0
 1,     142560,     142560,     2160,      768, 0xa53466dd
 0,         48, -9223372036854775808,        1,     5639, 0x658ca26b
 1,     144720,     144720,     2160,      768, 0xb43a74b0
 1,     146880,     146880,     2160,      768, 0x348f615c
-0,         49, -9223372036854775808,        1,     1385, 0xbcb96241
+0,         49, -9223372036854775808,        1,     1385, 0xbcb96241, F=0x0
 1,     149040,     149040,     2160,      768, 0x298f6e1b
-0,         50, -9223372036854775808,        1,     1142, 0x8c6df318
+0,         50, -9223372036854775808,        1,     1142, 0x8c6df318, F=0x0
 1,     151200,     151200,     2160,      768, 0x5db469c8
-0,         51, -9223372036854775808,        1,     1175, 0xcac1faef
+0,         51, -9223372036854775808,        1,     1175, 0xcac1faef, F=0x0
 1,     153360,     153360,     2160,      768, 0x08f16c2c
 1,     155520,     155520,     2160,      768, 0x4a0474cb
-0,         52, -9223372036854775808,        1,     1091, 0xa937e32a
+0,         52, -9223372036854775808,        1,     1091, 0xa937e32a, F=0x0
 1,     157680,     157680,     2160,      768, 0x077c760b
-0,         53, -9223372036854775808,        1,     1174, 0xfa50040d
+0,         53, -9223372036854775808,        1,     1174, 0xfa50040d, F=0x0
 1,     159840,     159840,     2160,      768, 0xa5777c2e
 1,     162000,     162000,     2160,      768, 0x0d157ea6
-0,         54, -9223372036854775808,        1,     1293, 0x0c8d2740
+0,         54, -9223372036854775808,        1,     1293, 0x0c8d2740, F=0x0
 1,     164160,     164160,     2160,      768, 0x9bc26f86
-0,         55, -9223372036854775808,        1,     1262, 0x502c0c35
+0,         55, -9223372036854775808,        1,     1262, 0x502c0c35, F=0x0
 1,     166320,     166320,     2160,      768, 0x1a72742d
-0,         56, -9223372036854775808,        1,     1038, 0x5e98c0cd
+0,         56, -9223372036854775808,        1,     1038, 0x5e98c0cd, F=0x0
 1,     168480,     168480,     2160,      768, 0xa5bb6bbb
 1,     170640,     170640,     2160,      768, 0x48496c4c
-0,         57, -9223372036854775808,        1,     1362, 0x256e43cf
+0,         57, -9223372036854775808,        1,     1362, 0x256e43cf, F=0x0
 1,     172800,     172800,     2160,      768, 0x800d78f0
-0,         58, -9223372036854775808,        1,     1200, 0x29e6f055
+0,         58, -9223372036854775808,        1,     1200, 0x29e6f055, F=0x0
 1,     174960,     174960,     2160,      768, 0x40db840c
 1,     177120,     177120,     2160,      768, 0xadc96a6b
-0,         59, -9223372036854775808,        1,     1495, 0x88e9b973
+0,         59, -9223372036854775808,        1,     1495, 0x88e9b973, F=0x0
 1,     179280,     179280,     2160,      768, 0xff986b03
-0,         60, -9223372036854775808,        1,     1386, 0x849297d2
+0,         60, -9223372036854775808,        1,     1386, 0x849297d2, F=0x0
 1,     181440,     181440,     2160,      768, 0x152473d6
-0,         61, -9223372036854775808,        1,     1572, 0x63b7dc79
+0,         61, -9223372036854775808,        1,     1572, 0x63b7dc79, F=0x0
 1,     183600,     183600,     2160,      768, 0x01567323
 1,     185760,     185760,     2160,      768, 0xe5f26fe5
-0,         62, -9223372036854775808,        1,     1190, 0x32ccf4cb
+0,         62, -9223372036854775808,        1,     1190, 0x32ccf4cb, F=0x0
 1,     187920,     187920,     2160,      768, 0xa8fd72cd
-0,         63, -9223372036854775808,        1,     1395, 0xa6ec4ae9
+0,         63, -9223372036854775808,        1,     1395, 0xa6ec4ae9, F=0x0
 1,     190080,     190080,     2160,      768, 0x8857655b
 0,         64, -9223372036854775808,        1,     5692, 0x81aed6f3
 1,     192240,     192240,     2160,      768, 0x84017b13
 1,     194400,     194400,     2160,      768, 0xe6a968b3
-0,         65, -9223372036854775808,        1,     1335, 0xe98a5497
+0,         65, -9223372036854775808,        1,     1335, 0xe98a5497, F=0x0
 1,     196560,     196560,     2160,      768, 0xb03a7566
-0,         66, -9223372036854775808,        1,     1361, 0x8ae15ab5
+0,         66, -9223372036854775808,        1,     1361, 0x8ae15ab5, F=0x0
 1,     198720,     198720,     2160,      768, 0x8bea5f62
 1,     200880,     200880,     2160,      768, 0xac7570b0
-0,         67, -9223372036854775808,        1,     1525, 0xed2bc1e8
+0,         67, -9223372036854775808,        1,     1525, 0xed2bc1e8, F=0x0
 1,     203040,     203040,     2160,      768, 0x11306fac
-0,         68, -9223372036854775808,        1,     1570, 0xba70d74b
+0,         68, -9223372036854775808,        1,     1570, 0xba70d74b, F=0x0
 1,     205200,     205200,     2160,      768, 0xf2af5b28
-0,         69, -9223372036854775808,        1,     1349, 0xd97a687d
+0,         69, -9223372036854775808,        1,     1349, 0xd97a687d, F=0x0
 1,     207360,     207360,     2160,      768, 0x3069681f
 1,     209520,     209520,     2160,      768, 0x7ff07033
-0,         70, -9223372036854775808,        1,     1270, 0xca8c3ca8
+0,         70, -9223372036854775808,        1,     1270, 0xca8c3ca8, F=0x0
 1,     211680,     211680,     2160,      768, 0xd74973f2
-0,         71, -9223372036854775808,        1,     1016, 0x32d0c81a
+0,         71, -9223372036854775808,        1,     1016, 0x32d0c81a, F=0x0
 1,     213840,     213840,     2160,      768, 0xb3627304
 1,     216000,     216000,     2160,      768, 0x11ff7589
-0,         72, -9223372036854775808,        1,      983, 0x536faa97
+0,         72, -9223372036854775808,        1,      983, 0x536faa97, F=0x0
 1,     218160,     218160,     2160,      768, 0x4a156c63
-0,         73, -9223372036854775808,        1,     1111, 0x44ade015
+0,         73, -9223372036854775808,        1,     1111, 0x44ade015, F=0x0
 1,     220320,     220320,     2160,      768, 0xcb036127
-0,         74, -9223372036854775808,        1,     1314, 0xce7c477d
+0,         74, -9223372036854775808,        1,     1314, 0xce7c477d, F=0x0
 1,     222480,     222480,     2160,      768, 0x0b796bb9
 1,     224640,     224640,     2160,      768, 0x1d516c35
-0,         75, -9223372036854775808,        1,     1005, 0x0196b491
+0,         75, -9223372036854775808,        1,     1005, 0x0196b491, F=0x0
 1,     226800,     226800,     2160,      768, 0xa9146da1
-0,         76, -9223372036854775808,        1,     1162, 0xb8f6ebe6
+0,         76, -9223372036854775808,        1,     1162, 0xb8f6ebe6, F=0x0
 1,     228960,     228960,     2160,      768, 0x6d176392
 1,     231120,     231120,     2160,      768, 0x6f966269
-0,         77, -9223372036854775808,        1,     1440, 0xfca67c72
+0,         77, -9223372036854775808,        1,     1440, 0xfca67c72, F=0x0
 1,     233280,     233280,     2160,      768, 0x7ee17724
-0,         78, -9223372036854775808,        1,     1437, 0x491181b1
+0,         78, -9223372036854775808,        1,     1437, 0x491181b1, F=0x0
 1,     235440,     235440,     2160,      768, 0x3f07614a
-0,         79, -9223372036854775808,        1,     1261, 0xf0cd1898
+0,         79, -9223372036854775808,        1,     1261, 0xf0cd1898, F=0x0
 1,     237600,     237600,     2160,      768, 0x49d56945
 1,     239760,     239760,     2160,      768, 0x68eb660a
 0,         80, -9223372036854775808,        1,     5638, 0x3a25a9f2
 1,     241920,     241920,     2160,      768, 0xe7c96677
-0,         81, -9223372036854775808,        1,     1091, 0x67d9c693
+0,         81, -9223372036854775808,        1,     1091, 0x67d9c693, F=0x0
 1,     244080,     244080,     2160,      768, 0x7dc07a35
 1,     246240,     246240,     2160,      768, 0x1e9c6397
-0,         82, -9223372036854775808,        1,      875, 0x52147bb1
+0,         82, -9223372036854775808,        1,      875, 0x52147bb1, F=0x0
 1,     248400,     248400,     2160,      768, 0x93ef5de4
-0,         83, -9223372036854775808,        1,     1188, 0x8522000f
+0,         83, -9223372036854775808,        1,     1188, 0x8522000f, F=0x0
 1,     250560,     250560,     2160,      768, 0x34af6803
-0,         84, -9223372036854775808,        1,     1360, 0x89b82e7b
+0,         84, -9223372036854775808,        1,     1360, 0x89b82e7b, F=0x0
 1,     252720,     252720,     2160,      768, 0x77e068be
 1,     254880,     254880,     2160,      768, 0x65e274de
-0,         85, -9223372036854775808,        1,     1378, 0xe8644914
+0,         85, -9223372036854775808,        1,     1378, 0xe8644914, F=0x0
 1,     257040,     257040,     2160,      768, 0xb7ad6a8a
-0,         86, -9223372036854775808,        1,     1194, 0x89fef83d
+0,         86, -9223372036854775808,        1,     1194, 0x89fef83d, F=0x0
 1,     259200,     259200,     2160,      768, 0x84b3635f
-0,         87, -9223372036854775808,        1,     1422, 0x99daa18b
+0,         87, -9223372036854775808,        1,     1422, 0x99daa18b, F=0x0
 1,     261360,     261360,     2160,      768, 0x066b78f2
 1,     263520,     263520,     2160,      768, 0xda137428
-0,         88, -9223372036854775808,        1,     1049, 0x72a9cec1
+0,         88, -9223372036854775808,        1,     1049, 0x72a9cec1, F=0x0
 1,     265680,     265680,     2160,      768, 0xfd6c7597
-0,         89, -9223372036854775808,        1,     1327, 0x7d15307c
+0,         89, -9223372036854775808,        1,     1327, 0x7d15307c, F=0x0
 1,     267840,     267840,     2160,      768, 0x8d766d40
diff --git a/tests/ref/fate/mtv b/tests/ref/fate/mtv
index 4f8f616..a781c08 100644
--- a/tests/ref/fate/mtv
+++ b/tests/ref/fate/mtv
@@ -133,6 +133,6 @@
 1,     104832,     104832,     1152,      418, 0xa105cdcc
 1,     105984,     105984,     1152,      418, 0x1477ba58
 1,     107136,     107136,     1152,      418, 0x8d0dcdb2
-0,         39,         39,        1,     3584, 0x0354c435
+0,         39,         39,        1,     3584, 0x0354c435, F=0x3
 1,     108288,     108288,     1152,      418, 0x0d7cbef4
 1,     109440,     109440,     1152,      294, 0x5e2b87c4
diff --git a/tests/ref/fate/mxf-demux b/tests/ref/fate/mxf-demux
index e162775..c67c4ab 100644
--- a/tests/ref/fate/mxf-demux
+++ b/tests/ref/fate/mxf-demux
@@ -2,98 +2,98 @@
 #tb 1: 1/25
 0,          0, -9223372036854775808,        1,     8468, 0xc0855553
 1,          0,          0,       50,    32000, 0x479155e6
-0,          1, -9223372036854775808,        1,     3814, 0xa10783b4
-0,          2, -9223372036854775808,        1,     3747, 0xb7bf6973
-0,          3, -9223372036854775808,        1,     3705, 0x5462a600
-0,          4, -9223372036854775808,        1,     3704, 0x1e564943
-0,          5, -9223372036854775808,        1,     3760, 0x10464b9a
-0,          6, -9223372036854775808,        1,     3799, 0xd41d6dcf
-0,          7, -9223372036854775808,        1,     3832, 0x5cf6999e
-0,          8, -9223372036854775808,        1,     3778, 0xe5fc7b9e
-0,          9, -9223372036854775808,        1,    38193, 0xd34e5dd4
+0,          1, -9223372036854775808,        1,     3814, 0xa10783b4, F=0x0
+0,          2, -9223372036854775808,        1,     3747, 0xb7bf6973, F=0x0
+0,          3, -9223372036854775808,        1,     3705, 0x5462a600, F=0x0
+0,          4, -9223372036854775808,        1,     3704, 0x1e564943, F=0x0
+0,          5, -9223372036854775808,        1,     3760, 0x10464b9a, F=0x0
+0,          6, -9223372036854775808,        1,     3799, 0xd41d6dcf, F=0x0
+0,          7, -9223372036854775808,        1,     3832, 0x5cf6999e, F=0x0
+0,          8, -9223372036854775808,        1,     3778, 0xe5fc7b9e, F=0x0
+0,          9, -9223372036854775808,        1,    38193, 0xd34e5dd4, F=0x0
 0,         10, -9223372036854775808,        1,     8520, 0x2a203e68
-0,         11, -9223372036854775808,        1,     3832, 0xe4c4b2fe
-0,         12, -9223372036854775808,        1,     3787, 0x0cf95fee
-0,         13, -9223372036854775808,        1,     3766, 0x9e019d14
-0,         14, -9223372036854775808,        1,     3785, 0x0ea9ae75
-0,         15, -9223372036854775808,        1,     3703, 0x11d349ff
-0,         16, -9223372036854775808,        1,     3731, 0x5cf358ef
-0,         17, -9223372036854775808,        1,     3785, 0x01c8962f
-0,         18, -9223372036854775808,        1,     3741, 0xb2c47d53
-0,         19, -9223372036854775808,        1,    38150, 0x08fa1f55
+0,         11, -9223372036854775808,        1,     3832, 0xe4c4b2fe, F=0x0
+0,         12, -9223372036854775808,        1,     3787, 0x0cf95fee, F=0x0
+0,         13, -9223372036854775808,        1,     3766, 0x9e019d14, F=0x0
+0,         14, -9223372036854775808,        1,     3785, 0x0ea9ae75, F=0x0
+0,         15, -9223372036854775808,        1,     3703, 0x11d349ff, F=0x0
+0,         16, -9223372036854775808,        1,     3731, 0x5cf358ef, F=0x0
+0,         17, -9223372036854775808,        1,     3785, 0x01c8962f, F=0x0
+0,         18, -9223372036854775808,        1,     3741, 0xb2c47d53, F=0x0
+0,         19, -9223372036854775808,        1,    38150, 0x08fa1f55, F=0x0
 0,         20, -9223372036854775808,        1,     8487, 0x0c234b9a
-0,         21, -9223372036854775808,        1,     3791, 0x831192ef
-0,         22, -9223372036854775808,        1,     3612, 0x598944fb
-0,         23, -9223372036854775808,        1,     3710, 0xccbb711a
-0,         24, -9223372036854775808,        1,     3864, 0x4385966e
-0,         25, -9223372036854775808,        1,     3919, 0x24e2abc3
-0,         26, -9223372036854775808,        1,     3777, 0x210c6219
-0,         27, -9223372036854775808,        1,     3811, 0x23bf68c2
-0,         28, -9223372036854775808,        1,     3802, 0x52688862
-0,         29, -9223372036854775808,        1,    38027, 0x3d5aa8b9
+0,         21, -9223372036854775808,        1,     3791, 0x831192ef, F=0x0
+0,         22, -9223372036854775808,        1,     3612, 0x598944fb, F=0x0
+0,         23, -9223372036854775808,        1,     3710, 0xccbb711a, F=0x0
+0,         24, -9223372036854775808,        1,     3864, 0x4385966e, F=0x0
+0,         25, -9223372036854775808,        1,     3919, 0x24e2abc3, F=0x0
+0,         26, -9223372036854775808,        1,     3777, 0x210c6219, F=0x0
+0,         27, -9223372036854775808,        1,     3811, 0x23bf68c2, F=0x0
+0,         28, -9223372036854775808,        1,     3802, 0x52688862, F=0x0
+0,         29, -9223372036854775808,        1,    38027, 0x3d5aa8b9, F=0x0
 0,         30, -9223372036854775808,        1,     8333, 0x617de950
-0,         31, -9223372036854775808,        1,     3831, 0x13fad8fc
-0,         32, -9223372036854775808,        1,     3719, 0xbc317470
-0,         33, -9223372036854775808,        1,     3761, 0xeac460b6
-0,         34, -9223372036854775808,        1,     3637, 0x27d64b32
-0,         35, -9223372036854775808,        1,     3666, 0xf0f700a5
-0,         36, -9223372036854775808,        1,     3788, 0x1c4662a8
-0,         37, -9223372036854775808,        1,     3960, 0xef6b9e99
-0,         38, -9223372036854775808,        1,     3793, 0x3a6ca832
-0,         39, -9223372036854775808,        1,    38312, 0xce1317cc
+0,         31, -9223372036854775808,        1,     3831, 0x13fad8fc, F=0x0
+0,         32, -9223372036854775808,        1,     3719, 0xbc317470, F=0x0
+0,         33, -9223372036854775808,        1,     3761, 0xeac460b6, F=0x0
+0,         34, -9223372036854775808,        1,     3637, 0x27d64b32, F=0x0
+0,         35, -9223372036854775808,        1,     3666, 0xf0f700a5, F=0x0
+0,         36, -9223372036854775808,        1,     3788, 0x1c4662a8, F=0x0
+0,         37, -9223372036854775808,        1,     3960, 0xef6b9e99, F=0x0
+0,         38, -9223372036854775808,        1,     3793, 0x3a6ca832, F=0x0
+0,         39, -9223372036854775808,        1,    38312, 0xce1317cc, F=0x0
 0,         40, -9223372036854775808,        1,     8548, 0x4ca944d4
-0,         41, -9223372036854775808,        1,     3866, 0x4e85bf0f
-0,         42, -9223372036854775808,        1,     3644, 0x030338e5
-0,         43, -9223372036854775808,        1,     3634, 0xa95f4512
-0,         44, -9223372036854775808,        1,     3925, 0x7583ba86
-0,         45, -9223372036854775808,        1,     3675, 0x979f423f
-0,         46, -9223372036854775808,        1,     3703, 0x11375f7a
-0,         47, -9223372036854775808,        1,     3705, 0xb7de5d16
-0,         48, -9223372036854775808,        1,     3688, 0x1db45852
-0,         49, -9223372036854775808,        1,    38412, 0x2ee26a63
+0,         41, -9223372036854775808,        1,     3866, 0x4e85bf0f, F=0x0
+0,         42, -9223372036854775808,        1,     3644, 0x030338e5, F=0x0
+0,         43, -9223372036854775808,        1,     3634, 0xa95f4512, F=0x0
+0,         44, -9223372036854775808,        1,     3925, 0x7583ba86, F=0x0
+0,         45, -9223372036854775808,        1,     3675, 0x979f423f, F=0x0
+0,         46, -9223372036854775808,        1,     3703, 0x11375f7a, F=0x0
+0,         47, -9223372036854775808,        1,     3705, 0xb7de5d16, F=0x0
+0,         48, -9223372036854775808,        1,     3688, 0x1db45852, F=0x0
+0,         49, -9223372036854775808,        1,    38412, 0x2ee26a63, F=0x0
 0,         50, -9223372036854775808,        1,     8385, 0x0bc20a27
 1,         50,         50,       50,    32000, 0x8f7e5009
-0,         51, -9223372036854775808,        1,     3733, 0xa3e2a9a0
-0,         52, -9223372036854775808,        1,     3773, 0x27769caa
-0,         53, -9223372036854775808,        1,     3670, 0xc8335e98
-0,         54, -9223372036854775808,        1,     3596, 0xd6512fb0
-0,         55, -9223372036854775808,        1,     3579, 0xa621fbc2
-0,         56, -9223372036854775808,        1,     3641, 0x2f4f46ca
-0,         57, -9223372036854775808,        1,     3686, 0x0a92385a
-0,         58, -9223372036854775808,        1,     3672, 0xe65137b9
-0,         59, -9223372036854775808,        1,    39065, 0xc723bf8b
+0,         51, -9223372036854775808,        1,     3733, 0xa3e2a9a0, F=0x0
+0,         52, -9223372036854775808,        1,     3773, 0x27769caa, F=0x0
+0,         53, -9223372036854775808,        1,     3670, 0xc8335e98, F=0x0
+0,         54, -9223372036854775808,        1,     3596, 0xd6512fb0, F=0x0
+0,         55, -9223372036854775808,        1,     3579, 0xa621fbc2, F=0x0
+0,         56, -9223372036854775808,        1,     3641, 0x2f4f46ca, F=0x0
+0,         57, -9223372036854775808,        1,     3686, 0x0a92385a, F=0x0
+0,         58, -9223372036854775808,        1,     3672, 0xe65137b9, F=0x0
+0,         59, -9223372036854775808,        1,    39065, 0xc723bf8b, F=0x0
 0,         60, -9223372036854775808,        1,     8611, 0x5d177f40
-0,         61, -9223372036854775808,        1,     3758, 0x33d59966
-0,         62, -9223372036854775808,        1,     3674, 0x54f37902
-0,         63, -9223372036854775808,        1,     3615, 0xa0f045fa
-0,         64, -9223372036854775808,        1,     3719, 0x41cf93ff
-0,         65, -9223372036854775808,        1,     3757, 0x3a1b7e8f
-0,         66, -9223372036854775808,        1,     3762, 0xe7f9714d
-0,         67, -9223372036854775808,        1,     3738, 0x8121805b
-0,         68, -9223372036854775808,        1,     3733, 0x13e262db
-0,         69, -9223372036854775808,        1,    38433, 0x3d58c500
+0,         61, -9223372036854775808,        1,     3758, 0x33d59966, F=0x0
+0,         62, -9223372036854775808,        1,     3674, 0x54f37902, F=0x0
+0,         63, -9223372036854775808,        1,     3615, 0xa0f045fa, F=0x0
+0,         64, -9223372036854775808,        1,     3719, 0x41cf93ff, F=0x0
+0,         65, -9223372036854775808,        1,     3757, 0x3a1b7e8f, F=0x0
+0,         66, -9223372036854775808,        1,     3762, 0xe7f9714d, F=0x0
+0,         67, -9223372036854775808,        1,     3738, 0x8121805b, F=0x0
+0,         68, -9223372036854775808,        1,     3733, 0x13e262db, F=0x0
+0,         69, -9223372036854775808,        1,    38433, 0x3d58c500, F=0x0
 0,         70, -9223372036854775808,        1,     8410, 0xa4f7fd2e
-0,         71, -9223372036854775808,        1,     3711, 0x0e112d3c
-0,         72, -9223372036854775808,        1,     3692, 0xb46574b2
-0,         73, -9223372036854775808,        1,     3563, 0xad43343d
-0,         74, -9223372036854775808,        1,     3613, 0x5cd85c4f
-0,         75, -9223372036854775808,        1,     3653, 0xe15a2853
-0,         76, -9223372036854775808,        1,     3684, 0x9ddd58cb
-0,         77, -9223372036854775808,        1,     3256, 0xd7f89f2e
-0,         78, -9223372036854775808,        1,     3698, 0x2b82624a
-0,         79, -9223372036854775808,        1,    39520, 0xd3f2b7c5
+0,         71, -9223372036854775808,        1,     3711, 0x0e112d3c, F=0x0
+0,         72, -9223372036854775808,        1,     3692, 0xb46574b2, F=0x0
+0,         73, -9223372036854775808,        1,     3563, 0xad43343d, F=0x0
+0,         74, -9223372036854775808,        1,     3613, 0x5cd85c4f, F=0x0
+0,         75, -9223372036854775808,        1,     3653, 0xe15a2853, F=0x0
+0,         76, -9223372036854775808,        1,     3684, 0x9ddd58cb, F=0x0
+0,         77, -9223372036854775808,        1,     3256, 0xd7f89f2e, F=0x0
+0,         78, -9223372036854775808,        1,     3698, 0x2b82624a, F=0x0
+0,         79, -9223372036854775808,        1,    39520, 0xd3f2b7c5, F=0x0
 0,         80, -9223372036854775808,        1,     8493, 0x163559be
-0,         81, -9223372036854775808,        1,     3719, 0x6fa0916f
-0,         82, -9223372036854775808,        1,     3655, 0xa9233de1
-0,         83, -9223372036854775808,        1,     3684, 0xa6125737
-0,         84, -9223372036854775808,        1,     3688, 0xa9da6686
-0,         85, -9223372036854775808,        1,     3685, 0x674d634e
-0,         86, -9223372036854775808,        1,     3677, 0x7a85535d
-0,         87, -9223372036854775808,        1,     3666, 0xce3600a2
-0,         88, -9223372036854775808,        1,     3837, 0x3a7090e1
-0,         89, -9223372036854775808,        1,    38696, 0x12c59cd2
+0,         81, -9223372036854775808,        1,     3719, 0x6fa0916f, F=0x0
+0,         82, -9223372036854775808,        1,     3655, 0xa9233de1, F=0x0
+0,         83, -9223372036854775808,        1,     3684, 0xa6125737, F=0x0
+0,         84, -9223372036854775808,        1,     3688, 0xa9da6686, F=0x0
+0,         85, -9223372036854775808,        1,     3685, 0x674d634e, F=0x0
+0,         86, -9223372036854775808,        1,     3677, 0x7a85535d, F=0x0
+0,         87, -9223372036854775808,        1,     3666, 0xce3600a2, F=0x0
+0,         88, -9223372036854775808,        1,     3837, 0x3a7090e1, F=0x0
+0,         89, -9223372036854775808,        1,    38696, 0x12c59cd2, F=0x0
 0,         90, -9223372036854775808,        1,     8022, 0xd343433f
-0,         91, -9223372036854775808,        1,     5157, 0x440c14e5
-0,         92, -9223372036854775808,        1,     5003, 0xf8e1daff
-0,         93, -9223372036854775808,        1,     4954, 0x89866344
-0,         94, -9223372036854775808,        1,    53664, 0xeb0c4c42
+0,         91, -9223372036854775808,        1,     5157, 0x440c14e5, F=0x0
+0,         92, -9223372036854775808,        1,     5003, 0xf8e1daff, F=0x0
+0,         93, -9223372036854775808,        1,     4954, 0x89866344, F=0x0
+0,         94, -9223372036854775808,        1,    53664, 0xeb0c4c42, F=0x0
diff --git a/tests/ref/fate/nc-demux b/tests/ref/fate/nc-demux
index 1d00f8e..f03aded 100644
--- a/tests/ref/fate/nc-demux
+++ b/tests/ref/fate/nc-demux
@@ -1,92 +1,92 @@
 #tb 0: 1/100
 0,          0, -9223372036854775808,        1,    19787, 0x75e463f3
-0,          1, -9223372036854775808,        1,    11913, 0x0f429c34
-0,          2, -9223372036854775808,        1,    14225, 0xbd3c704c
-0,          3, -9223372036854775808,        1,    10357, 0xbf232393
-0,          4, -9223372036854775808,        1,     9595, 0xf565d39e
-0,          5, -9223372036854775808,        1,     9262, 0x2afd6ce0
-0,          6, -9223372036854775808,        1,    12214, 0x6ae81d9b
-0,          7, -9223372036854775808,        1,    13920, 0x31b5b307
-0,          8, -9223372036854775808,        1,    10164, 0x141eca4e
-0,          9, -9223372036854775808,        1,     9516, 0xd5f2c42b
-0,         10, -9223372036854775808,        1,    10006, 0x80850a76
-0,         11, -9223372036854775808,        1,    11791, 0x10bc2dcd
-0,         12, -9223372036854775808,        1,    13756, 0xda1fee08
-0,         13, -9223372036854775808,        1,    10452, 0xbb3d62b0
-0,         14, -9223372036854775808,        1,     9171, 0x64ae10f6
-0,         15, -9223372036854775808,        1,     8816, 0x31ad8fcb
-0,         16, -9223372036854775808,        1,    13168, 0xea1085ac
-0,         17, -9223372036854775808,        1,    12797, 0x25143d22
-0,         18, -9223372036854775808,        1,    11324, 0x3a54b38e
-0,         19, -9223372036854775808,        1,     9173, 0x8b2bf552
-0,         20, -9223372036854775808,        1,     9247, 0x2e87226b
-0,         21, -9223372036854775808,        1,    14140, 0x1063786c
-0,         22, -9223372036854775808,        1,    14437, 0xde123a17
-0,         23, -9223372036854775808,        1,    11938, 0x3f1168f4
-0,         24, -9223372036854775808,        1,    11966, 0xdd6786ec
-0,         25, -9223372036854775808,        1,    13213, 0x8ab27c58
-0,         26, -9223372036854775808,        1,    11843, 0x90415d8b
-0,         27, -9223372036854775808,        1,    13345, 0x3c0e1793
-0,         28, -9223372036854775808,        1,     9977, 0x74fc7f4b
-0,         29, -9223372036854775808,        1,     9158, 0x0b5426a5
-0,         30, -9223372036854775808,        1,    12715, 0x0035d569
+0,          1, -9223372036854775808,        1,    11913, 0x0f429c34, F=0x0
+0,          2, -9223372036854775808,        1,    14225, 0xbd3c704c, F=0x0
+0,          3, -9223372036854775808,        1,    10357, 0xbf232393, F=0x0
+0,          4, -9223372036854775808,        1,     9595, 0xf565d39e, F=0x0
+0,          5, -9223372036854775808,        1,     9262, 0x2afd6ce0, F=0x0
+0,          6, -9223372036854775808,        1,    12214, 0x6ae81d9b, F=0x0
+0,          7, -9223372036854775808,        1,    13920, 0x31b5b307, F=0x0
+0,          8, -9223372036854775808,        1,    10164, 0x141eca4e, F=0x0
+0,          9, -9223372036854775808,        1,     9516, 0xd5f2c42b, F=0x0
+0,         10, -9223372036854775808,        1,    10006, 0x80850a76, F=0x0
+0,         11, -9223372036854775808,        1,    11791, 0x10bc2dcd, F=0x0
+0,         12, -9223372036854775808,        1,    13756, 0xda1fee08, F=0x0
+0,         13, -9223372036854775808,        1,    10452, 0xbb3d62b0, F=0x0
+0,         14, -9223372036854775808,        1,     9171, 0x64ae10f6, F=0x0
+0,         15, -9223372036854775808,        1,     8816, 0x31ad8fcb, F=0x0
+0,         16, -9223372036854775808,        1,    13168, 0xea1085ac, F=0x0
+0,         17, -9223372036854775808,        1,    12797, 0x25143d22, F=0x0
+0,         18, -9223372036854775808,        1,    11324, 0x3a54b38e, F=0x0
+0,         19, -9223372036854775808,        1,     9173, 0x8b2bf552, F=0x0
+0,         20, -9223372036854775808,        1,     9247, 0x2e87226b, F=0x0
+0,         21, -9223372036854775808,        1,    14140, 0x1063786c, F=0x0
+0,         22, -9223372036854775808,        1,    14437, 0xde123a17, F=0x0
+0,         23, -9223372036854775808,        1,    11938, 0x3f1168f4, F=0x0
+0,         24, -9223372036854775808,        1,    11966, 0xdd6786ec, F=0x0
+0,         25, -9223372036854775808,        1,    13213, 0x8ab27c58, F=0x0
+0,         26, -9223372036854775808,        1,    11843, 0x90415d8b, F=0x0
+0,         27, -9223372036854775808,        1,    13345, 0x3c0e1793, F=0x0
+0,         28, -9223372036854775808,        1,     9977, 0x74fc7f4b, F=0x0
+0,         29, -9223372036854775808,        1,     9158, 0x0b5426a5, F=0x0
+0,         30, -9223372036854775808,        1,    12715, 0x0035d569, F=0x0
 0,         31, -9223372036854775808,        1,    19944, 0xe2887ba8
-0,         32, -9223372036854775808,        1,    12762, 0xb0f17939
-0,         33, -9223372036854775808,        1,    10260, 0x182b27aa
-0,         34, -9223372036854775808,        1,     7405, 0x227fe9bf
-0,         35, -9223372036854775808,        1,    13317, 0x1a678c62
-0,         36, -9223372036854775808,        1,    11304, 0x3277af6d
-0,         37, -9223372036854775808,        1,    13291, 0xe267616a
-0,         38, -9223372036854775808,        1,     8975, 0xe7eeacea
-0,         39, -9223372036854775808,        1,     8473, 0x8bb1cbff
-0,         40, -9223372036854775808,        1,    13878, 0xfd3d55bb
-0,         41, -9223372036854775808,        1,    11278, 0x61c7c55e
-0,         42, -9223372036854775808,        1,    13785, 0x2acbf88f
-0,         43, -9223372036854775808,        1,     9521, 0x99e2d065
-0,         44, -9223372036854775808,        1,     9340, 0xe5c96510
-0,         45, -9223372036854775808,        1,    12777, 0x4c3c7844
-0,         46, -9223372036854775808,        1,    10685, 0x39e0f42e
-0,         47, -9223372036854775808,        1,    14237, 0x9398d07f
-0,         48, -9223372036854775808,        1,     9021, 0x3343c7ec
-0,         49, -9223372036854775808,        1,     9327, 0xad489e86
-0,         50, -9223372036854775808,        1,    13507, 0xb1344f1c
-0,         51, -9223372036854775808,        1,    10199, 0x9a8868bf
-0,         52, -9223372036854775808,        1,    14535, 0xddb13f41
-0,         53, -9223372036854775808,        1,     8773, 0x3d8b6a79
-0,         54, -9223372036854775808,        1,    16084, 0x5d915de4
-0,         55, -9223372036854775808,        1,     9156, 0x5cb08a6a
-0,         56, -9223372036854775808,        1,    15027, 0xc23b1dc8
-0,         57, -9223372036854775808,        1,     8240, 0xd6d3526c
-0,         58, -9223372036854775808,        1,     8720, 0x439c43bf
-0,         59, -9223372036854775808,        1,    13684, 0x18fc82f0
-0,         60, -9223372036854775808,        1,     8829, 0xa3ebeb30
-0,         61, -9223372036854775808,        1,    14650, 0x99e8678c
+0,         32, -9223372036854775808,        1,    12762, 0xb0f17939, F=0x0
+0,         33, -9223372036854775808,        1,    10260, 0x182b27aa, F=0x0
+0,         34, -9223372036854775808,        1,     7405, 0x227fe9bf, F=0x0
+0,         35, -9223372036854775808,        1,    13317, 0x1a678c62, F=0x0
+0,         36, -9223372036854775808,        1,    11304, 0x3277af6d, F=0x0
+0,         37, -9223372036854775808,        1,    13291, 0xe267616a, F=0x0
+0,         38, -9223372036854775808,        1,     8975, 0xe7eeacea, F=0x0
+0,         39, -9223372036854775808,        1,     8473, 0x8bb1cbff, F=0x0
+0,         40, -9223372036854775808,        1,    13878, 0xfd3d55bb, F=0x0
+0,         41, -9223372036854775808,        1,    11278, 0x61c7c55e, F=0x0
+0,         42, -9223372036854775808,        1,    13785, 0x2acbf88f, F=0x0
+0,         43, -9223372036854775808,        1,     9521, 0x99e2d065, F=0x0
+0,         44, -9223372036854775808,        1,     9340, 0xe5c96510, F=0x0
+0,         45, -9223372036854775808,        1,    12777, 0x4c3c7844, F=0x0
+0,         46, -9223372036854775808,        1,    10685, 0x39e0f42e, F=0x0
+0,         47, -9223372036854775808,        1,    14237, 0x9398d07f, F=0x0
+0,         48, -9223372036854775808,        1,     9021, 0x3343c7ec, F=0x0
+0,         49, -9223372036854775808,        1,     9327, 0xad489e86, F=0x0
+0,         50, -9223372036854775808,        1,    13507, 0xb1344f1c, F=0x0
+0,         51, -9223372036854775808,        1,    10199, 0x9a8868bf, F=0x0
+0,         52, -9223372036854775808,        1,    14535, 0xddb13f41, F=0x0
+0,         53, -9223372036854775808,        1,     8773, 0x3d8b6a79, F=0x0
+0,         54, -9223372036854775808,        1,    16084, 0x5d915de4, F=0x0
+0,         55, -9223372036854775808,        1,     9156, 0x5cb08a6a, F=0x0
+0,         56, -9223372036854775808,        1,    15027, 0xc23b1dc8, F=0x0
+0,         57, -9223372036854775808,        1,     8240, 0xd6d3526c, F=0x0
+0,         58, -9223372036854775808,        1,     8720, 0x439c43bf, F=0x0
+0,         59, -9223372036854775808,        1,    13684, 0x18fc82f0, F=0x0
+0,         60, -9223372036854775808,        1,     8829, 0xa3ebeb30, F=0x0
+0,         61, -9223372036854775808,        1,    14650, 0x99e8678c, F=0x0
 0,         62, -9223372036854775808,        1,    19626, 0x80a7ee5c
-0,         63, -9223372036854775808,        1,     7762, 0x7c209a12
-0,         64, -9223372036854775808,        1,    13636, 0xc89c1aa3
-0,         65, -9223372036854775808,        1,     8337, 0x749bf76a
-0,         66, -9223372036854775808,        1,    15098, 0xc98bc6dc
-0,         67, -9223372036854775808,        1,     9070, 0xcd4cf7f1
-0,         68, -9223372036854775808,        1,     8269, 0x90e95d54
-0,         69, -9223372036854775808,        1,    12672, 0x034888d0
-0,         70, -9223372036854775808,        1,     7519, 0x6c089672
-0,         71, -9223372036854775808,        1,    14439, 0x5d2478b9
-0,         72, -9223372036854775808,        1,     6928, 0x98fbaa67
-0,         73, -9223372036854775808,        1,     8735, 0x07643f1e
-0,         74, -9223372036854775808,        1,    13522, 0x55034cdb
-0,         75, -9223372036854775808,        1,     7807, 0xf5983103
-0,         76, -9223372036854775808,        1,    14484, 0xfc9cf260
-0,         77, -9223372036854775808,        1,     7193, 0x170a0fa1
-0,         78, -9223372036854775808,        1,     9444, 0x6f9be36f
-0,         79, -9223372036854775808,        1,    12598, 0x69b7609d
-0,         80, -9223372036854775808,        1,     7650, 0x1abaec9e
-0,         81, -9223372036854775808,        1,    15162, 0x2a87f723
-0,         82, -9223372036854775808,        1,     7752, 0xcca248aa
-0,         83, -9223372036854775808,        1,     9085, 0x1ca7d7e5
-0,         84, -9223372036854775808,        1,    13187, 0xababcc64
-0,         85, -9223372036854775808,        1,     7968, 0x64a28f46
-0,         86, -9223372036854775808,        1,    15474, 0xf34c587c
-0,         87, -9223372036854775808,        1,     8615, 0x61301034
-0,         88, -9223372036854775808,        1,    14129, 0x42c88bea
-0,         89, -9223372036854775808,        1,     7223, 0x675d7500
-0,         90, -9223372036854775808,        1,     3072, 0x4cb6254c
+0,         63, -9223372036854775808,        1,     7762, 0x7c209a12, F=0x0
+0,         64, -9223372036854775808,        1,    13636, 0xc89c1aa3, F=0x0
+0,         65, -9223372036854775808,        1,     8337, 0x749bf76a, F=0x0
+0,         66, -9223372036854775808,        1,    15098, 0xc98bc6dc, F=0x0
+0,         67, -9223372036854775808,        1,     9070, 0xcd4cf7f1, F=0x0
+0,         68, -9223372036854775808,        1,     8269, 0x90e95d54, F=0x0
+0,         69, -9223372036854775808,        1,    12672, 0x034888d0, F=0x0
+0,         70, -9223372036854775808,        1,     7519, 0x6c089672, F=0x0
+0,         71, -9223372036854775808,        1,    14439, 0x5d2478b9, F=0x0
+0,         72, -9223372036854775808,        1,     6928, 0x98fbaa67, F=0x0
+0,         73, -9223372036854775808,        1,     8735, 0x07643f1e, F=0x0
+0,         74, -9223372036854775808,        1,    13522, 0x55034cdb, F=0x0
+0,         75, -9223372036854775808,        1,     7807, 0xf5983103, F=0x0
+0,         76, -9223372036854775808,        1,    14484, 0xfc9cf260, F=0x0
+0,         77, -9223372036854775808,        1,     7193, 0x170a0fa1, F=0x0
+0,         78, -9223372036854775808,        1,     9444, 0x6f9be36f, F=0x0
+0,         79, -9223372036854775808,        1,    12598, 0x69b7609d, F=0x0
+0,         80, -9223372036854775808,        1,     7650, 0x1abaec9e, F=0x0
+0,         81, -9223372036854775808,        1,    15162, 0x2a87f723, F=0x0
+0,         82, -9223372036854775808,        1,     7752, 0xcca248aa, F=0x0
+0,         83, -9223372036854775808,        1,     9085, 0x1ca7d7e5, F=0x0
+0,         84, -9223372036854775808,        1,    13187, 0xababcc64, F=0x0
+0,         85, -9223372036854775808,        1,     7968, 0x64a28f46, F=0x0
+0,         86, -9223372036854775808,        1,    15474, 0xf34c587c, F=0x0
+0,         87, -9223372036854775808,        1,     8615, 0x61301034, F=0x0
+0,         88, -9223372036854775808,        1,    14129, 0x42c88bea, F=0x0
+0,         89, -9223372036854775808,        1,     7223, 0x675d7500, F=0x0
+0,         90, -9223372036854775808,        1,     3072, 0x4cb6254c, F=0x0
diff --git a/tests/ref/fate/nsv-demux b/tests/ref/fate/nsv-demux
index 0f09446..0ad08b1 100644
--- a/tests/ref/fate/nsv-demux
+++ b/tests/ref/fate/nsv-demux
@@ -1,173 +1,173 @@
 #tb 0: 1001/15000
 #tb 1: 1/30000000
 0,          0,          0,        1,       12, 0x1396035f
-0,          1,          1,        1,       24, 0x8ab80ac7
-0,          2,          2,        1,      208, 0x1de1603e
+0,          1,          1,        1,       24, 0x8ab80ac7, F=0x0
+0,          2,          2,        1,      208, 0x1de1603e, F=0x0
 1,    4173848,    4173848,  1567346,      104, 0x8ae85dc9
 1,    5741194,    5741194,  1567346,      105, 0xb7033847
-0,          3,          3,        1,      364, 0xffb4b341
+0,          3,          3,        1,      364, 0xffb4b341, F=0x0
 1,    7308540,    7308540,  1567346,      104, 0x5f853482
-0,          4,          4,        1,      456, 0x7a4deaeb
+0,          4,          4,        1,      456, 0x7a4deaeb, F=0x0
 1,    8875886,    8875886,  1567346,      105, 0xfcb731fd
-0,          5,          5,        1,      432, 0xf4ddd813
+0,          5,          5,        1,      432, 0xf4ddd813, F=0x0
 1,   10443232,   10443232,  1567346,      104, 0x4f8232bb
 1,   12010578,   12010578,  1567346,      105, 0x2f543039
-0,          6,          6,        1,      572, 0xc84c21ff
+0,          6,          6,        1,      572, 0xc84c21ff, F=0x0
 1,   13577924,   13577924,  1567346,      104, 0xe4cc34a1
-0,          7,          7,        1,      500, 0x0e6bf9f4
+0,          7,          7,        1,      500, 0x0e6bf9f4, F=0x0
 1,   15145270,   15145270,  1567346,      105, 0xea663711
-0,          8,          8,        1,      508, 0x2d6efe2a
+0,          8,          8,        1,      508, 0x2d6efe2a, F=0x0
 1,   16712616,   16712616,  1567346,      104, 0x3c583098
-0,          9,          9,        1,      436, 0x7d07d3c5
+0,          9,          9,        1,      436, 0x7d07d3c5, F=0x0
 1,   18279962,   18279962,  1567346,      105, 0xbe6c33ff
 1,   19847308,   19847308,  1567346,      104, 0x56de2d7a
-0,         10,         10,        1,      620, 0xa9313342
+0,         10,         10,        1,      620, 0xa9313342, F=0x0
 1,   21414654,   21414654,  1567346,      105, 0x4e80385d
 0,         11,         11,        1,     1384, 0x9b97c579
 1,   22982000,   22982000,  1567346,      104, 0x34eb340d
-0,         12,         12,        1,      760, 0xd1aa8183
+0,         12,         12,        1,      760, 0xd1aa8183, F=0x0
 1,   24549346,   24549346,  1567346,      105, 0x87e82f74
-0,         13,         13,        1,      836, 0x261da980
+0,         13,         13,        1,      836, 0x261da980, F=0x0
 1,   26116692,   26116692,  1567346,      104, 0xa546377d
 1,   27684038,   27684038,  1567346,      105, 0x92bd349d
-0,         14,         14,        1,      860, 0x52f0afa0
+0,         14,         14,        1,      860, 0x52f0afa0, F=0x0
 1,   29251384,   29251384,  1567346,      104, 0xdba53f3d
-0,         15,         15,        1,      696, 0x63845855
+0,         15,         15,        1,      696, 0x63845855, F=0x0
 1,   30818730,   30818730,  1567346,      105, 0xd3c3384e
-0,         16,         16,        1,      460, 0x2916e7be
+0,         16,         16,        1,      460, 0x2916e7be, F=0x0
 1,   32386076,   32386076,  1567346,      104, 0xdf7d30ce
 1,   33953422,   33953422,  1567346,      105, 0xae20344e
-0,         17,         17,        1,      328, 0xab8caaca
+0,         17,         17,        1,      328, 0xab8caaca, F=0x0
 1,   35520768,   35520768,  1567346,      104, 0xe4cc33b7
-0,         18,         18,        1,      396, 0xc775bc8e
+0,         18,         18,        1,      396, 0xc775bc8e, F=0x0
 1,   37088114,   37088114,  1567346,      105, 0xda993806
-0,         19,         19,        1,      344, 0x114ea25a
+0,         19,         19,        1,      344, 0x114ea25a, F=0x0
 1,   38655460,   38655460,  1567346,      104, 0xd6d12edd
 1,   40222806,   40222806,  1567346,      105, 0x6b9c2ed5
 1,   41790152,   41790152,  1567346,      104, 0xce6c3b04
-0,         21,         21,        1,      532, 0xd5650f54
+0,         21,         21,        1,      532, 0xd5650f54, F=0x0
 1,   43357498,   43357498,  1567346,      105, 0x31db399e
 1,   44924844,   44924844,  1567346,      104, 0xd50b347a
-0,         23,         23,        1,      476, 0x77f1f3a7
+0,         23,         23,        1,      476, 0x77f1f3a7, F=0x0
 1,   46492190,   46492190,  1567346,      105, 0xe87734d6
 1,   48059536,   48059536,  1567346,      104, 0x21873412
 0,         25,         25,        1,      976, 0x2f7cf7ae
 1,   50140000,   50140000,  1567346,      105, 0x29c03514
 1,   51707346,   51707346,  1567346,      104, 0x91a5347a
 1,   53274692,   53274692,  1567346,      105, 0xdbbf3696
-0,         27,         27,        1,      104, 0x8fbf2f65
+0,         27,         27,        1,      104, 0x8fbf2f65, F=0x0
 1,   54842038,   54842038,  1567346,      104, 0x3b463afc
 1,   56409384,   56409384,  1567346,      105, 0xddf53845
 1,   57976730,   57976730,  1567346,      104, 0x94c23d1a
-0,         29,         29,        1,      652, 0xa9244ac0
+0,         29,         29,        1,      652, 0xa9244ac0, F=0x0
 1,   59544076,   59544076,  1567346,      105, 0xc0fd36c4
 1,   61111422,   61111422,  1567346,      104, 0x36d535e0
-0,         31,         31,        1,      152, 0x97804cc1
+0,         31,         31,        1,      152, 0x97804cc1, F=0x0
 1,   62678768,   62678768,  1567346,      105, 0xe81a35da
 1,   64246114,   64246114,  1567346,      104, 0x2b4e3699
 1,   65813460,   65813460,  1567346,      105, 0x3978392c
-0,         33,         33,        1,      156, 0xca434d31
+0,         33,         33,        1,      156, 0xca434d31, F=0x0
 1,   67380806,   67380806,  1567346,      104, 0xca903459
-0,         34,         34,        1,      196, 0x1ff16161
+0,         34,         34,        1,      196, 0x1ff16161, F=0x0
 1,   68948152,   68948152,  1567346,      105, 0xedc4374a
-0,         35,         35,        1,      176, 0x9b455230
+0,         35,         35,        1,      176, 0x9b455230, F=0x0
 1,   70515498,   70515498,  1567346,      104, 0x0b3938d2
-0,         36,         36,        1,      156, 0xbbbf4bf3
+0,         36,         36,        1,      156, 0xbbbf4bf3, F=0x0
 1,   72082844,   72082844,  1567346,      105, 0xb2653246
 1,   73650190,   73650190,  1567346,      104, 0x76333479
-0,         37,         37,        1,      220, 0x77a97152
+0,         37,         37,        1,      220, 0x77a97152, F=0x0
 1,   75217536,   75217536,  1567346,      105, 0x779138c4
-0,         38,         38,        1,      204, 0x667d5ecf
+0,         38,         38,        1,      204, 0x667d5ecf, F=0x0
 1,   76784882,   76784882,  1567346,      104, 0xfe142f55
-0,         39,         39,        1,      232, 0x3a266ccd
+0,         39,         39,        1,      232, 0x3a266ccd, F=0x0
 1,   78352228,   78352228,  1567346,      105, 0x39aa3410
 1,   79919574,   79919574,  1567346,      104, 0x520f330d
-0,         40,         40,        1,      308, 0x844a95b7
+0,         40,         40,        1,      308, 0x844a95b7, F=0x0
 1,   81486920,   81486920,  1567346,      104, 0x1aad37b0
-0,         41,         41,        1,      384, 0x71d2c695
+0,         41,         41,        1,      384, 0x71d2c695, F=0x0
 1,   83054266,   83054266,  1567346,      105, 0x164038eb
 1,   84621612,   84621612,  1567346,      104, 0x21d434bd
-0,         43,         43,        1,      520, 0x4f9d012a
+0,         43,         43,        1,      520, 0x4f9d012a, F=0x0
 1,   86188958,   86188958,  1567346,      105, 0x9c1236d4
 1,   87756304,   87756304,  1567346,      104, 0x6aa933c3
 1,   89323650,   89323650,  1567346,      105, 0xec5c371e
-0,         45,         45,        1,      648, 0xabd13b29
+0,         45,         45,        1,      648, 0xabd13b29, F=0x0
 1,   90890996,   90890996,  1567346,      104, 0xedb33251
 1,   92458342,   92458342,  1567346,      105, 0x4f953476
 1,   94025688,   94025688,  1567346,      104, 0x7da13400
-0,         47,         47,        1,      604, 0x006b328f
+0,         47,         47,        1,      604, 0x006b328f, F=0x0
 1,   95593034,   95593034,  1567346,      105, 0x57a83aaa
 1,   97160380,   97160380,  1567346,      104, 0x8b822f2f
-0,         49,         49,        1,      492, 0xa150fac1
+0,         49,         49,        1,      492, 0xa150fac1, F=0x0
 1,   98727726,   98727726,  1567346,      105, 0x3b31341a
 1,  100295072,  100295072,  1567346,      104, 0x74a4316d
 1,  101862418,  101862418,  1567346,      105, 0x05013469
-0,         51,         51,        1,      456, 0xd3e9e52c
+0,         51,         51,        1,      456, 0xd3e9e52c, F=0x0
 1,  103429764,  103429764,  1567346,      104, 0xcc8932cb
 1,  104997110,  104997110,  1567346,      105, 0xd9233422
-0,         53,         53,        1,      340, 0x7229a1b7
+0,         53,         53,        1,      340, 0x7229a1b7, F=0x0
 1,  106564456,  106564456,  1567346,      104, 0x5c603350
 1,  108131802,  108131802,  1567346,      105, 0x76e631bc
 1,  109699148,  109699148,  1567346,      104, 0x657e3b35
-0,         55,         55,        1,      280, 0x48948b60
+0,         55,         55,        1,      280, 0x48948b60, F=0x0
 1,  111266494,  111266494,  1567346,      105, 0x9d283226
 1,  112833840,  112833840,  1567346,      104, 0x574936ef
-0,         57,         57,        1,      304, 0x3ae68dcf
+0,         57,         57,        1,      304, 0x3ae68dcf, F=0x0
 1,  114401186,  114401186,  1567346,      105, 0x1b923555
 1,  115968532,  115968532,  1567346,      104, 0x2a9f3583
 1,  117535878,  117535878,  1567346,      105, 0xb8cd306f
-0,         59,         59,        1,      324, 0x005da2ab
+0,         59,         59,        1,      324, 0x005da2ab, F=0x0
 1,  119103224,  119103224,  1567346,      104, 0xa21d3475
 1,  120670570,  120670570,  1567346,      105, 0x651539ea
-0,         61,         61,        1,      348, 0x3230a873
+0,         61,         61,        1,      348, 0x3230a873, F=0x0
 1,  122237916,  122237916,  1567346,      104, 0x7b7235b8
 1,  123805262,  123805262,  1567346,      105, 0x2bbb337a
 1,  125372608,  125372608,  1567346,      104, 0x26c332eb
-0,         63,         63,        1,      336, 0x8655ad2d
+0,         63,         63,        1,      336, 0x8655ad2d, F=0x0
 1,  126939954,  126939954,  1567346,      105, 0x990838d8
 1,  128507300,  128507300,  1567346,      104, 0x4dc63ad4
 1,  130074646,  130074646,  1567346,      105, 0xfb8e3418
-0,         65,         65,        1,      380, 0x742ebc44
+0,         65,         65,        1,      380, 0x742ebc44, F=0x0
 1,  131641992,  131641992,  1567346,      104, 0x1882388e
 1,  133209338,  133209338,  1567346,      105, 0xe6b534cc
-0,         67,         67,        1,      340, 0xfc1aa74e
+0,         67,         67,        1,      340, 0xfc1aa74e, F=0x0
 1,  134776684,  134776684,  1567346,      104, 0x60fe35d0
 1,  136344030,  136344030,  1567346,      105, 0x5164354a
 1,  137911376,  137911376,  1567346,      104, 0x92ee3115
-0,         69,         69,        1,      332, 0x3cfba56c
+0,         69,         69,        1,      332, 0x3cfba56c, F=0x0
 1,  139478722,  139478722,  1567346,      105, 0x9b32327e
 1,  141046068,  141046068,  1567346,      104, 0x9b9e394a
-0,         71,         71,        1,      332, 0xc024ad4c
+0,         71,         71,        1,      332, 0xc024ad4c, F=0x0
 1,  142613414,  142613414,  1567346,      105, 0xce3c337f
 1,  144180760,  144180760,  1567346,      104, 0x7a4e33c5
 0,         73,         73,        1,     3432, 0xcdfcd1c9
 1,  146956000,  146956000,  1567346,      105, 0x0e3d34eb
 1,  148523346,  148523346,  1567346,      104, 0xd23e338e
 1,  150090692,  150090692,  1567346,      105, 0x4abf340c
-0,         75,         75,        1,      792, 0xe7df949f
+0,         75,         75,        1,      792, 0xe7df949f, F=0x0
 1,  151658038,  151658038,  1567346,      104, 0xe7522e15
 1,  153225384,  153225384,  1567346,      105, 0x995037ba
-0,         77,         77,        1,      912, 0xbc61d549
+0,         77,         77,        1,      912, 0xbc61d549, F=0x0
 1,  154792730,  154792730,  1567346,      104, 0x5ef12e9b
 1,  156360076,  156360076,  1567346,      105, 0x5c3b3166
 1,  157927422,  157927422,  1567346,      104, 0xfc38314b
-0,         79,         79,        1,      956, 0x809bdff0
+0,         79,         79,        1,      956, 0x809bdff0, F=0x0
 1,  159494768,  159494768,  1567346,      104, 0x5e3636e4
 1,  161062114,  161062114,  1567346,      105, 0xae7b3345
-0,         81,         81,        1,      652, 0x88d3484f
+0,         81,         81,        1,      652, 0x88d3484f, F=0x0
 1,  162629460,  162629460,  1567346,      104, 0x635c317a
 1,  164196806,  164196806,  1567346,      105, 0xa90c361a
 1,  165764152,  165764152,  1567346,      104, 0x8f563594
 0,         83,         83,        1,     1284, 0xecc37164
 1,  167156000,  167156000,  1567346,      105, 0x028e3985
 1,  168723346,  168723346,  1567346,      104, 0x4fd135f6
-0,         85,         85,        1,      428, 0x4794e174
+0,         85,         85,        1,      428, 0x4794e174, F=0x0
 1,  170290692,  170290692,  1567346,      105, 0xaaf539ac
 1,  171858038,  171858038,  1567346,      104, 0x668b3265
 1,  173425384,  173425384,  1567346,      105, 0x74ad3b4b
-0,         87,         87,        1,      460, 0x7253d94a
+0,         87,         87,        1,      460, 0x7253d94a, F=0x0
 1,  174992730,  174992730,  1567346,      104, 0xbde5332f
 1,  176560076,  176560076,  1567346,      105, 0xdc3631e7
 1,  178127422,  178127422,  1567346,      104, 0x3e363a1e
-0,         89,         89,        1,       24, 0x664206ba
+0,         89,         89,        1,       24, 0x664206ba, F=0x0
 1,  179694768,  179694768,  1567346,      105, 0x48b63926
diff --git a/tests/ref/fate/paf-demux b/tests/ref/fate/paf-demux
index 689f9b1..857fb54 100644
--- a/tests/ref/fate/paf-demux
+++ b/tests/ref/fate/paf-demux
@@ -2,159 +2,159 @@
 #tb 1: 1/22050
 0,          0,          0,        1,   262144, 0x7f9a3c6a
 1,          0,          0,    57330,   131072, 0x255a6ac2
-0,          1,          1,        1,   260600, 0x0329e6f4
-0,          2,          2,        1,   259724, 0x2db0ad5e
-0,          3,          3,        1,   258616, 0xe666009d
-0,          4,          4,        1,   257364, 0xba42458c
-0,          5,          5,        1,   255964, 0xf7e04c83
-0,          6,          6,        1,   254192, 0xa04b49ff
-0,          7,          7,        1,   252232, 0x65d4ab4c
-0,          8,          8,        1,   249960, 0x8f0b3854
-0,          9,          9,        1,   247396, 0x16d70776
-0,         10,         10,        1,   244452, 0x8b0648f3
-0,         11,         11,        1,   240972, 0x07e3ef41
-0,         12,         12,        1,   237288, 0x197a1964
-0,         13,         13,        1,   233344, 0xd6c51f01
-0,         14,         14,        1,   229196, 0x48581a65
-0,         15,         15,        1,   224688, 0x710e1fdb
-0,         16,         16,        1,   219248, 0xcd96719d
-0,         17,         17,        1,   212712, 0x4de31fd8
-0,         18,         18,        1,   205864, 0x21a0a106
-0,         19,         19,        1,   199148, 0xd1d77c92
-0,         20,         20,        1,   192072, 0x620627a6
-0,         21,         21,        1,   184928, 0x81548454
-0,         22,         22,        1,   178296, 0x7bb40918
-0,         23,         23,        1,   171944, 0xa7b714bb
-0,         24,         24,        1,   165584, 0xa6246dba
-0,         25,         25,        1,   159468, 0x7bc54abb
-0,         26,         26,        1,   153524, 0xd2774028
+0,          1,          1,        1,   260600, 0x0329e6f4, F=0x0
+0,          2,          2,        1,   259724, 0x2db0ad5e, F=0x0
+0,          3,          3,        1,   258616, 0xe666009d, F=0x0
+0,          4,          4,        1,   257364, 0xba42458c, F=0x0
+0,          5,          5,        1,   255964, 0xf7e04c83, F=0x0
+0,          6,          6,        1,   254192, 0xa04b49ff, F=0x0
+0,          7,          7,        1,   252232, 0x65d4ab4c, F=0x0
+0,          8,          8,        1,   249960, 0x8f0b3854, F=0x0
+0,          9,          9,        1,   247396, 0x16d70776, F=0x0
+0,         10,         10,        1,   244452, 0x8b0648f3, F=0x0
+0,         11,         11,        1,   240972, 0x07e3ef41, F=0x0
+0,         12,         12,        1,   237288, 0x197a1964, F=0x0
+0,         13,         13,        1,   233344, 0xd6c51f01, F=0x0
+0,         14,         14,        1,   229196, 0x48581a65, F=0x0
+0,         15,         15,        1,   224688, 0x710e1fdb, F=0x0
+0,         16,         16,        1,   219248, 0xcd96719d, F=0x0
+0,         17,         17,        1,   212712, 0x4de31fd8, F=0x0
+0,         18,         18,        1,   205864, 0x21a0a106, F=0x0
+0,         19,         19,        1,   199148, 0xd1d77c92, F=0x0
+0,         20,         20,        1,   192072, 0x620627a6, F=0x0
+0,         21,         21,        1,   184928, 0x81548454, F=0x0
+0,         22,         22,        1,   178296, 0x7bb40918, F=0x0
+0,         23,         23,        1,   171944, 0xa7b714bb, F=0x0
+0,         24,         24,        1,   165584, 0xa6246dba, F=0x0
+0,         25,         25,        1,   159468, 0x7bc54abb, F=0x0
+0,         26,         26,        1,   153524, 0xd2774028, F=0x0
 1,      57330,      57330,    57330,   131072, 0xcc38a5e5
-0,         27,         27,        1,   147568, 0xd94b2368
-0,         28,         28,        1,   141536, 0xb512eae6
-0,         29,         29,        1,   135368, 0x9b6ea2b3
-0,         30,         30,        1,   128296, 0x7c26d136
-0,         31,         31,        1,   120932, 0xccb8b273
-0,         32,         32,        1,   113432, 0x9f2bb997
-0,         33,         33,        1,   105724, 0x735519f6
-0,         34,         34,        1,    98428, 0xa2933dbb
-0,         35,         35,        1,    91136, 0xbe852457
-0,         36,         36,        1,    83844, 0xc471106a
-0,         37,         37,        1,    76648, 0x3f6e1c92
-0,         38,         38,        1,    69624, 0x00f86b27
-0,         39,         39,        1,    62436, 0xf360ccf0
-0,         40,         40,        1,    55268, 0x0373c2a3
-0,         41,         41,        1,    48220, 0xd5a5e0c1
-0,         42,         42,        1,    48216, 0x1da7e0ad
-0,         43,         43,        1,    48212, 0xa984e098
-0,         44,         44,        1,    48208, 0x7962e082
-0,         45,         45,        1,    48204, 0xc245e06e
-0,         46,         46,        1,    48200, 0x4f2de059
-0,         47,         47,        1,    48196, 0x2013e043
-0,         48,         48,        1,    48192, 0x34ffe02c
-0,         49,         49,        1,    48188, 0x7f22e018
-0,         50,         50,        1,    48184, 0x0d5ae003
-0,         51,         51,        1,    48180, 0xdf91dfed
-0,         52,         52,        1,    48176, 0xf5eddfd6
+0,         27,         27,        1,   147568, 0xd94b2368, F=0x0
+0,         28,         28,        1,   141536, 0xb512eae6, F=0x0
+0,         29,         29,        1,   135368, 0x9b6ea2b3, F=0x0
+0,         30,         30,        1,   128296, 0x7c26d136, F=0x0
+0,         31,         31,        1,   120932, 0xccb8b273, F=0x0
+0,         32,         32,        1,   113432, 0x9f2bb997, F=0x0
+0,         33,         33,        1,   105724, 0x735519f6, F=0x0
+0,         34,         34,        1,    98428, 0xa2933dbb, F=0x0
+0,         35,         35,        1,    91136, 0xbe852457, F=0x0
+0,         36,         36,        1,    83844, 0xc471106a, F=0x0
+0,         37,         37,        1,    76648, 0x3f6e1c92, F=0x0
+0,         38,         38,        1,    69624, 0x00f86b27, F=0x0
+0,         39,         39,        1,    62436, 0xf360ccf0, F=0x0
+0,         40,         40,        1,    55268, 0x0373c2a3, F=0x0
+0,         41,         41,        1,    48220, 0xd5a5e0c1, F=0x0
+0,         42,         42,        1,    48216, 0x1da7e0ad, F=0x0
+0,         43,         43,        1,    48212, 0xa984e098, F=0x0
+0,         44,         44,        1,    48208, 0x7962e082, F=0x0
+0,         45,         45,        1,    48204, 0xc245e06e, F=0x0
+0,         46,         46,        1,    48200, 0x4f2de059, F=0x0
+0,         47,         47,        1,    48196, 0x2013e043, F=0x0
+0,         48,         48,        1,    48192, 0x34ffe02c, F=0x0
+0,         49,         49,        1,    48188, 0x7f22e018, F=0x0
+0,         50,         50,        1,    48184, 0x0d5ae003, F=0x0
+0,         51,         51,        1,    48180, 0xdf91dfed, F=0x0
+0,         52,         52,        1,    48176, 0xf5eddfd6, F=0x0
 1,     114660,     114660,    57330,   131072, 0x4d9c2c7e
-0,         53,         53,        1,    48172, 0x415fdfc2
-0,         54,         54,        1,    48168, 0xd0d8dfad
-0,         55,         55,        1,    48164, 0xa47edf97
-0,         56,         56,        1,    48160, 0xbc4adf80
-0,         57,         57,        1,    48156, 0x08fcdf6c
-0,         58,         58,        1,    48152, 0x99c5df57
-0,         59,         59,        1,    41116, 0x8c22a4c1
-0,         60,         60,        1,    34124, 0x33c9e476
-0,         61,         61,        1,    27272, 0x8069fb08
-0,         62,         62,        1,    20636, 0xa413e37e
-0,         63,         63,        1,    14072, 0x428a2075
-0,         64,         64,        1,     7712, 0x7c6b914f
-0,         65,         65,        1,   262144, 0x687484cb
-0,         66,         66,        1,   256292, 0x0dec8b5a
-0,         67,         67,        1,   250612, 0xd127f411
-0,         68,         68,        1,   245404, 0x4e760ddf
-0,         69,         69,        1,   241956, 0x0412f83d
-0,         70,         70,        1,   241184, 0x0de227e2
-0,         71,         71,        1,   241180, 0xebe9eafb
-0,         72,         72,        1,   241176, 0xf0c8eae5
-0,         73,         73,        1,   241172, 0x47bbeace
-0,         74,         74,        1,   241168, 0xfb8aeab9
-0,         75,         75,        1,   241164, 0x0180eaa3
-0,         76,         76,        1,   241160, 0x5978ea8c
-0,         77,         77,        1,   241156, 0xbc86ea78
-0,         78,         78,        1,   241152, 0x71b4ea63
+0,         53,         53,        1,    48172, 0x415fdfc2, F=0x0
+0,         54,         54,        1,    48168, 0xd0d8dfad, F=0x0
+0,         55,         55,        1,    48164, 0xa47edf97, F=0x0
+0,         56,         56,        1,    48160, 0xbc4adf80, F=0x0
+0,         57,         57,        1,    48156, 0x08fcdf6c, F=0x0
+0,         58,         58,        1,    48152, 0x99c5df57, F=0x0
+0,         59,         59,        1,    41116, 0x8c22a4c1, F=0x0
+0,         60,         60,        1,    34124, 0x33c9e476, F=0x0
+0,         61,         61,        1,    27272, 0x8069fb08, F=0x0
+0,         62,         62,        1,    20636, 0xa413e37e, F=0x0
+0,         63,         63,        1,    14072, 0x428a2075, F=0x0
+0,         64,         64,        1,     7712, 0x7c6b914f, F=0x0
+0,         65,         65,        1,   262144, 0x687484cb, F=0x0
+0,         66,         66,        1,   256292, 0x0dec8b5a, F=0x0
+0,         67,         67,        1,   250612, 0xd127f411, F=0x0
+0,         68,         68,        1,   245404, 0x4e760ddf, F=0x0
+0,         69,         69,        1,   241956, 0x0412f83d, F=0x0
+0,         70,         70,        1,   241184, 0x0de227e2, F=0x0
+0,         71,         71,        1,   241180, 0xebe9eafb, F=0x0
+0,         72,         72,        1,   241176, 0xf0c8eae5, F=0x0
+0,         73,         73,        1,   241172, 0x47bbeace, F=0x0
+0,         74,         74,        1,   241168, 0xfb8aeab9, F=0x0
+0,         75,         75,        1,   241164, 0x0180eaa3, F=0x0
+0,         76,         76,        1,   241160, 0x5978ea8c, F=0x0
+0,         77,         77,        1,   241156, 0xbc86ea78, F=0x0
+0,         78,         78,        1,   241152, 0x71b4ea63, F=0x0
 1,     171990,     171990,    57330,   131072, 0x1b512fb8
-0,         79,         79,        1,   241148, 0x78fbea4d
+0,         79,         79,        1,   241148, 0x78fbea4d, F=0x0
 0,         80,         80,        1,   241144, 0xd263ea36
-0,         81,         81,        1,   237912, 0xcb5839a6
-0,         82,         82,        1,   229296, 0x350f07b6
-0,         83,         83,        1,   214256, 0x3c954096
-0,         84,         84,        1,   198068, 0x1470ae1f
-0,         85,         85,        1,   180664, 0xa80de8b6
-0,         86,         86,        1,   164672, 0x11ecf816
-0,         87,         87,        1,   148996, 0x6346aa49
-0,         88,         88,        1,   134804, 0x8fe4699a
-0,         89,         89,        1,   124488, 0x63b82fa0
-0,         90,         90,        1,   116892, 0xac785c29
-0,         91,         91,        1,   109528, 0xc24da959
-0,         92,         92,        1,   102688, 0xba25eb56
-0,         93,         93,        1,    95192, 0x999820b3
-0,         94,         94,        1,    89980, 0xa81aee1a
-0,         95,         95,        1,    84696, 0xb274dad5
-0,         96,         96,        1,    79152, 0xd7936f6e
-0,         97,         97,        1,    74232, 0x1abdf78a
-0,         98,         98,        1,    69112, 0x212918e8
-0,         99,         99,        1,    63484, 0x45e36b2f
-0,        100,        100,        1,    58616, 0xef171a5a
-0,        101,        101,        1,    53396, 0xd16be9a0
-0,        102,        102,        1,    47388, 0xc602914b
-0,        103,        103,        1,    42276, 0x6b86b9dd
-0,        104,        104,        1,    36932, 0xea0d85cb
+0,         81,         81,        1,   237912, 0xcb5839a6, F=0x0
+0,         82,         82,        1,   229296, 0x350f07b6, F=0x0
+0,         83,         83,        1,   214256, 0x3c954096, F=0x0
+0,         84,         84,        1,   198068, 0x1470ae1f, F=0x0
+0,         85,         85,        1,   180664, 0xa80de8b6, F=0x0
+0,         86,         86,        1,   164672, 0x11ecf816, F=0x0
+0,         87,         87,        1,   148996, 0x6346aa49, F=0x0
+0,         88,         88,        1,   134804, 0x8fe4699a, F=0x0
+0,         89,         89,        1,   124488, 0x63b82fa0, F=0x0
+0,         90,         90,        1,   116892, 0xac785c29, F=0x0
+0,         91,         91,        1,   109528, 0xc24da959, F=0x0
+0,         92,         92,        1,   102688, 0xba25eb56, F=0x0
+0,         93,         93,        1,    95192, 0x999820b3, F=0x0
+0,         94,         94,        1,    89980, 0xa81aee1a, F=0x0
+0,         95,         95,        1,    84696, 0xb274dad5, F=0x0
+0,         96,         96,        1,    79152, 0xd7936f6e, F=0x0
+0,         97,         97,        1,    74232, 0x1abdf78a, F=0x0
+0,         98,         98,        1,    69112, 0x212918e8, F=0x0
+0,         99,         99,        1,    63484, 0x45e36b2f, F=0x0
+0,        100,        100,        1,    58616, 0xef171a5a, F=0x0
+0,        101,        101,        1,    53396, 0xd16be9a0, F=0x0
+0,        102,        102,        1,    47388, 0xc602914b, F=0x0
+0,        103,        103,        1,    42276, 0x6b86b9dd, F=0x0
+0,        104,        104,        1,    36932, 0xea0d85cb, F=0x0
 1,     229320,     229320,    57330,   131072, 0x4e478505
-0,        105,        105,        1,    30408, 0xc7df6cba
-0,        106,        106,        1,    24468, 0x80007205
-0,        107,        107,        1,    18572, 0xb4aa84d2
-0,        108,        108,        1,    12632, 0x12c2efb8
-0,        109,        109,        1,     6604, 0x75002817
-0,        110,        110,        1,   262144, 0xf9544f5b
-0,        111,        111,        1,   255448, 0x9242877e
-0,        112,        112,        1,   248532, 0xef495999
-0,        113,        113,        1,   238032, 0xac29500b
-0,        114,        114,        1,   225424, 0x73035f24
-0,        115,        115,        1,   215860, 0xed94de14
-0,        116,        116,        1,   205996, 0x4d417b16
-0,        117,        117,        1,   191904, 0xc195d49f
-0,        118,        118,        1,   182596, 0x32a14954
-0,        119,        119,        1,   174988, 0xdc83fa02
-0,        120,        120,        1,   168008, 0x5e1d7302
-0,        121,        121,        1,   161032, 0xf503efb4
-0,        122,        122,        1,   154044, 0x1df06a7c
-0,        123,        123,        1,   147056, 0x4c22ec13
-0,        124,        124,        1,   140060, 0xede97385
-0,        125,        125,        1,   133064, 0x50eefee6
-0,        126,        126,        1,   126060, 0xc6478fb8
-0,        127,        127,        1,   119056, 0xf45a2080
-0,        128,        128,        1,   112044, 0x1d49b4ae
-0,        129,        129,        1,   105028, 0xd35649dd
-0,        130,        130,        1,    98012, 0x03ede949
+0,        105,        105,        1,    30408, 0xc7df6cba, F=0x0
+0,        106,        106,        1,    24468, 0x80007205, F=0x0
+0,        107,        107,        1,    18572, 0xb4aa84d2, F=0x0
+0,        108,        108,        1,    12632, 0x12c2efb8, F=0x0
+0,        109,        109,        1,     6604, 0x75002817, F=0x0
+0,        110,        110,        1,   262144, 0xf9544f5b, F=0x0
+0,        111,        111,        1,   255448, 0x9242877e, F=0x0
+0,        112,        112,        1,   248532, 0xef495999, F=0x0
+0,        113,        113,        1,   238032, 0xac29500b, F=0x0
+0,        114,        114,        1,   225424, 0x73035f24, F=0x0
+0,        115,        115,        1,   215860, 0xed94de14, F=0x0
+0,        116,        116,        1,   205996, 0x4d417b16, F=0x0
+0,        117,        117,        1,   191904, 0xc195d49f, F=0x0
+0,        118,        118,        1,   182596, 0x32a14954, F=0x0
+0,        119,        119,        1,   174988, 0xdc83fa02, F=0x0
+0,        120,        120,        1,   168008, 0x5e1d7302, F=0x0
+0,        121,        121,        1,   161032, 0xf503efb4, F=0x0
+0,        122,        122,        1,   154044, 0x1df06a7c, F=0x0
+0,        123,        123,        1,   147056, 0x4c22ec13, F=0x0
+0,        124,        124,        1,   140060, 0xede97385, F=0x0
+0,        125,        125,        1,   133064, 0x50eefee6, F=0x0
+0,        126,        126,        1,   126060, 0xc6478fb8, F=0x0
+0,        127,        127,        1,   119056, 0xf45a2080, F=0x0
+0,        128,        128,        1,   112044, 0x1d49b4ae, F=0x0
+0,        129,        129,        1,   105028, 0xd35649dd, F=0x0
+0,        130,        130,        1,    98012, 0x03ede949, F=0x0
 1,     286650,     286650,    57330,   131072, 0xb29e283e
-0,        131,        131,        1,    91000, 0x57128fb0
-0,        132,        132,        1,    84000, 0xf7ff39c0
-0,        133,        133,        1,    77004, 0xda18e580
-0,        134,        134,        1,    70004, 0x8eff8af4
-0,        135,        135,        1,    62992, 0x665831fd
-0,        136,        136,        1,    55976, 0x130ada75
-0,        137,        137,        1,    48956, 0x4cf47b2f
-0,        138,        138,        1,    41936, 0x7a8e2006
-0,        139,        139,        1,    34920, 0x9527ca2b
-0,        140,        140,        1,    27912, 0x4c8078df
-0,        141,        141,        1,    20884, 0x1e152e1f
-0,        142,        142,        1,    13848, 0xd358d51b
-0,        143,        143,        1,   262144, 0x38f14810
-0,        144,        144,        1,   255104, 0x579bf26b
-0,        145,        145,        1,   255100, 0x6488a2d4
-0,        146,        146,        1,   248096, 0xbe966730
-0,        147,        147,        1,   241144, 0xd8e3abf6
-0,        148,        148,        1,   234268, 0xde2bb38e
-0,        149,        149,        1,   227440, 0xb78f1aed
-0,        150,        150,        1,   220692, 0x86026588
-0,        151,        151,        1,   214000, 0x0fdbc796
+0,        131,        131,        1,    91000, 0x57128fb0, F=0x0
+0,        132,        132,        1,    84000, 0xf7ff39c0, F=0x0
+0,        133,        133,        1,    77004, 0xda18e580, F=0x0
+0,        134,        134,        1,    70004, 0x8eff8af4, F=0x0
+0,        135,        135,        1,    62992, 0x665831fd, F=0x0
+0,        136,        136,        1,    55976, 0x130ada75, F=0x0
+0,        137,        137,        1,    48956, 0x4cf47b2f, F=0x0
+0,        138,        138,        1,    41936, 0x7a8e2006, F=0x0
+0,        139,        139,        1,    34920, 0x9527ca2b, F=0x0
+0,        140,        140,        1,    27912, 0x4c8078df, F=0x0
+0,        141,        141,        1,    20884, 0x1e152e1f, F=0x0
+0,        142,        142,        1,    13848, 0xd358d51b, F=0x0
+0,        143,        143,        1,   262144, 0x38f14810, F=0x0
+0,        144,        144,        1,   255104, 0x579bf26b, F=0x0
+0,        145,        145,        1,   255100, 0x6488a2d4, F=0x0
+0,        146,        146,        1,   248096, 0xbe966730, F=0x0
+0,        147,        147,        1,   241144, 0xd8e3abf6, F=0x0
+0,        148,        148,        1,   234268, 0xde2bb38e, F=0x0
+0,        149,        149,        1,   227440, 0xb78f1aed, F=0x0
+0,        150,        150,        1,   220692, 0x86026588, F=0x0
+0,        151,        151,        1,   214000, 0x0fdbc796, F=0x0
diff --git a/tests/ref/fate/redcode-demux b/tests/ref/fate/redcode-demux
index 34a2924..a7e2838 100644
--- a/tests/ref/fate/redcode-demux
+++ b/tests/ref/fate/redcode-demux
@@ -4,4 +4,4 @@
 1,          0,          0,    18140,    14816, 0xd185e8c7
 0,      10010,      10010,    10010,  1626092, 0x070bd882
 1,      18140,      18140,    40920,    32736, 0x791b737a
-0,      20020,      20020,    10010,   893932, 0x8c7cd0a6
+0,      20020,      20020,    10010,   893932, 0x8c7cd0a6, F=0x3
diff --git a/tests/ref/fate/wmv8-drm-nodec b/tests/ref/fate/wmv8-drm-nodec
index 9067c6a..76c4e75 100644
--- a/tests/ref/fate/wmv8-drm-nodec
+++ b/tests/ref/fate/wmv8-drm-nodec
@@ -5,148 +5,148 @@
 1,        435,        435,        0,     1088, 0x8dfa1368
 1,        740,        740,        0,     1088, 0xc0d211be
 1,       1023,       1023,        0,     1088, 0x8238113a
-0,       1208,       1208,        0,      137, 0x903c415e
-0,       1250,       1250,        0,      942, 0xd5b7d2aa
-0,       1291,       1291,        0,      841, 0xaffd8ce6
+0,       1208,       1208,        0,      137, 0x903c415e, F=0x0
+0,       1250,       1250,        0,      942, 0xd5b7d2aa, F=0x0
+0,       1291,       1291,        0,      841, 0xaffd8ce6, F=0x0
 1,       1306,       1306,        0,     1088, 0x9f8924b7
-0,       1333,       1333,        0,     1164, 0x4ed84836
-0,       1375,       1375,        0,     1492, 0x37f3e8aa
-0,       1416,       1416,        0,     1663, 0xc091392d
-0,       1458,       1458,        0,     1443, 0x6162c718
-0,       1500,       1500,        0,     1721, 0x7bdb3dd0
-0,       1541,       1541,        0,     1410, 0xde689881
-0,       1583,       1583,        0,     1258, 0xb5b86920
+0,       1333,       1333,        0,     1164, 0x4ed84836, F=0x0
+0,       1375,       1375,        0,     1492, 0x37f3e8aa, F=0x0
+0,       1416,       1416,        0,     1663, 0xc091392d, F=0x0
+0,       1458,       1458,        0,     1443, 0x6162c718, F=0x0
+0,       1500,       1500,        0,     1721, 0x7bdb3dd0, F=0x0
+0,       1541,       1541,        0,     1410, 0xde689881, F=0x0
+0,       1583,       1583,        0,     1258, 0xb5b86920, F=0x0
 1,       1589,       1589,        0,     1088, 0x767f317a
-0,       1625,       1625,        0,     2050, 0x99b6d7c7
-0,       1666,       1666,        0,     1242, 0x9ba35009
-0,       1708,       1708,        0,     1630, 0x17f10192
-0,       1750,       1750,        0,     1747, 0xbbee59d7
-0,       1791,       1791,        0,     1565, 0xb09b00d9
-0,       1833,       1833,        0,     1573, 0xd2e62201
+0,       1625,       1625,        0,     2050, 0x99b6d7c7, F=0x0
+0,       1666,       1666,        0,     1242, 0x9ba35009, F=0x0
+0,       1708,       1708,        0,     1630, 0x17f10192, F=0x0
+0,       1750,       1750,        0,     1747, 0xbbee59d7, F=0x0
+0,       1791,       1791,        0,     1565, 0xb09b00d9, F=0x0
+0,       1833,       1833,        0,     1573, 0xd2e62201, F=0x0
 1,       1872,       1872,        0,     1088, 0x57000d38
-0,       1875,       1875,        0,     1353, 0x2305a24d
-0,       1916,       1916,        0,     1425, 0xf41bbb46
-0,       1958,       1958,        0,     1355, 0xfc08a762
-0,       2000,       2000,        0,     1363, 0x98cda71d
-0,       2041,       2041,        0,     1547, 0x8742f11f
-0,       2083,       2083,        0,     1967, 0x43d61723
-0,       2125,       2125,        0,     1378, 0xde22c753
-0,       2166,       2166,        0,      961, 0x2418a4da
+0,       1875,       1875,        0,     1353, 0x2305a24d, F=0x0
+0,       1916,       1916,        0,     1425, 0xf41bbb46, F=0x0
+0,       1958,       1958,        0,     1355, 0xfc08a762, F=0x0
+0,       2000,       2000,        0,     1363, 0x98cda71d, F=0x0
+0,       2041,       2041,        0,     1547, 0x8742f11f, F=0x0
+0,       2083,       2083,        0,     1967, 0x43d61723, F=0x0
+0,       2125,       2125,        0,     1378, 0xde22c753, F=0x0
+0,       2166,       2166,        0,      961, 0x2418a4da, F=0x0
 1,       2198,       2198,        0,     1088, 0xad977261
-0,       2208,       2208,        0,      968, 0x0d04ba51
-0,       2250,       2250,        0,     1140, 0x737f3543
-0,       2291,       2291,        0,     1119, 0x3c050388
-0,       2333,       2333,        0,     1078, 0xeac8d981
-0,       2375,       2375,        0,     1113, 0xebfa0314
-0,       2416,       2416,        0,     1229, 0x95dc3cb5
-0,       2458,       2458,        0,     1311, 0x8a6f5bda
-0,       2500,       2500,        0,     1270, 0x2e66540a
-0,       2541,       2541,        0,     1408, 0x5f489779
-0,       2583,       2583,        0,     1359, 0x8bd085f5
-0,       2625,       2625,        0,     1428, 0xef9ba480
-0,       2666,       2666,        0,     1179, 0x5bb221a8
-0,       2708,       2708,        0,     1108, 0x9a6019a8
-0,       2750,       2750,        0,     1205, 0xccba4d22
-0,       2791,       2791,        0,     1306, 0xde708c19
-0,       2833,       2833,        0,     1724, 0xa70b521e
-0,       2875,       2875,       41,     1336, 0xdf3974b9
-0,       2916,       2916,       41,     1259, 0x1f6b4307
-0,       2958,       2958,       41,     1194, 0x635f5a43
-0,       3000,       3000,       41,     1183, 0x1dd47115
-0,       3041,       3041,       41,     1126, 0x5bac3cc8
-0,       3083,       3083,       41,     1360, 0x1fe2d981
-0,       3125,       3125,       41,     1261, 0x34288acb
-0,       3166,       3166,       41,     1250, 0x26bd72b3
-0,       3208,       3208,       41,     1147, 0x02e81ba0
-0,       3250,       3250,       41,     1368, 0xb8146962
-0,       3291,       3291,       41,     1377, 0xf7b6ce65
-0,       3333,       3333,       41,     1396, 0x88467dee
-0,       3375,       3375,       41,     1408, 0x5585c25c
-0,       3416,       3416,       41,     1551, 0x42002c8d
-0,       3458,       3458,       41,     1524, 0xbcb609e3
+0,       2208,       2208,        0,      968, 0x0d04ba51, F=0x0
+0,       2250,       2250,        0,     1140, 0x737f3543, F=0x0
+0,       2291,       2291,        0,     1119, 0x3c050388, F=0x0
+0,       2333,       2333,        0,     1078, 0xeac8d981, F=0x0
+0,       2375,       2375,        0,     1113, 0xebfa0314, F=0x0
+0,       2416,       2416,        0,     1229, 0x95dc3cb5, F=0x0
+0,       2458,       2458,        0,     1311, 0x8a6f5bda, F=0x0
+0,       2500,       2500,        0,     1270, 0x2e66540a, F=0x0
+0,       2541,       2541,        0,     1408, 0x5f489779, F=0x0
+0,       2583,       2583,        0,     1359, 0x8bd085f5, F=0x0
+0,       2625,       2625,        0,     1428, 0xef9ba480, F=0x0
+0,       2666,       2666,        0,     1179, 0x5bb221a8, F=0x0
+0,       2708,       2708,        0,     1108, 0x9a6019a8, F=0x0
+0,       2750,       2750,        0,     1205, 0xccba4d22, F=0x0
+0,       2791,       2791,        0,     1306, 0xde708c19, F=0x0
+0,       2833,       2833,        0,     1724, 0xa70b521e, F=0x0
+0,       2875,       2875,       41,     1336, 0xdf3974b9, F=0x0
+0,       2916,       2916,       41,     1259, 0x1f6b4307, F=0x0
+0,       2958,       2958,       41,     1194, 0x635f5a43, F=0x0
+0,       3000,       3000,       41,     1183, 0x1dd47115, F=0x0
+0,       3041,       3041,       41,     1126, 0x5bac3cc8, F=0x0
+0,       3083,       3083,       41,     1360, 0x1fe2d981, F=0x0
+0,       3125,       3125,       41,     1261, 0x34288acb, F=0x0
+0,       3166,       3166,       41,     1250, 0x26bd72b3, F=0x0
+0,       3208,       3208,       41,     1147, 0x02e81ba0, F=0x0
+0,       3250,       3250,       41,     1368, 0xb8146962, F=0x0
+0,       3291,       3291,       41,     1377, 0xf7b6ce65, F=0x0
+0,       3333,       3333,       41,     1396, 0x88467dee, F=0x0
+0,       3375,       3375,       41,     1408, 0x5585c25c, F=0x0
+0,       3416,       3416,       41,     1551, 0x42002c8d, F=0x0
+0,       3458,       3458,       41,     1524, 0xbcb609e3, F=0x0
 1,       3482,       3482,        0,     1088, 0xdce57471
-0,       3500,       3500,       41,     1554, 0x3d740564
-0,       3541,       3541,       41,     1467, 0xc349f2d7
-0,       3583,       3583,       41,     1066, 0xb7401462
-0,       3625,       3625,       41,     1502, 0x3ee602ed
-0,       3666,       3666,       41,     1148, 0xba463637
-0,       3708,       3708,       41,     1351, 0x5e85ae79
-0,       3750,       3750,       41,     1187, 0xed8d6055
-0,       3791,       3791,       41,     1200, 0x64185be6
-0,       3833,       3833,       41,     1175, 0x12ad3c1e
-0,       3875,       3875,       41,     1179, 0x7e034570
-0,       3916,       3916,       41,     1136, 0x5c633c51
+0,       3500,       3500,       41,     1554, 0x3d740564, F=0x0
+0,       3541,       3541,       41,     1467, 0xc349f2d7, F=0x0
+0,       3583,       3583,       41,     1066, 0xb7401462, F=0x0
+0,       3625,       3625,       41,     1502, 0x3ee602ed, F=0x0
+0,       3666,       3666,       41,     1148, 0xba463637, F=0x0
+0,       3708,       3708,       41,     1351, 0x5e85ae79, F=0x0
+0,       3750,       3750,       41,     1187, 0xed8d6055, F=0x0
+0,       3791,       3791,       41,     1200, 0x64185be6, F=0x0
+0,       3833,       3833,       41,     1175, 0x12ad3c1e, F=0x0
+0,       3875,       3875,       41,     1179, 0x7e034570, F=0x0
+0,       3916,       3916,       41,     1136, 0x5c633c51, F=0x0
 1,       3918,       3918,        0,     1088, 0xf3887977
-0,       3958,       3958,       41,     1064, 0x5eb51d89
-0,       4000,       4000,       41,      953, 0xe148bbdd
-0,       4041,       4041,       41,      989, 0x901ec306
-0,       4083,       4083,       41,     1030, 0x680de26f
-0,       4125,       4125,       41,     1078, 0x86e0ee43
-0,       4166,       4166,       41,     1232, 0x98546a86
-0,       4208,       4208,       41,     1164, 0x93305074
-0,       4250,       4250,       41,     1348, 0x27cfa91b
-0,       4291,       4291,       41,     1417, 0x2312d70e
-0,       4333,       4333,       41,     1285, 0x46ca4cca
+0,       3958,       3958,       41,     1064, 0x5eb51d89, F=0x0
+0,       4000,       4000,       41,      953, 0xe148bbdd, F=0x0
+0,       4041,       4041,       41,      989, 0x901ec306, F=0x0
+0,       4083,       4083,       41,     1030, 0x680de26f, F=0x0
+0,       4125,       4125,       41,     1078, 0x86e0ee43, F=0x0
+0,       4166,       4166,       41,     1232, 0x98546a86, F=0x0
+0,       4208,       4208,       41,     1164, 0x93305074, F=0x0
+0,       4250,       4250,       41,     1348, 0x27cfa91b, F=0x0
+0,       4291,       4291,       41,     1417, 0x2312d70e, F=0x0
+0,       4333,       4333,       41,     1285, 0x46ca4cca, F=0x0
 1,       4353,       4353,        0,     1088, 0x1d6c8ed2
-0,       4375,       4375,       41,     1037, 0xcf09dd3d
-0,       4416,       4416,       41,     1005, 0xe780cf1f
-0,       4458,       4458,       41,      890, 0x8b1d8c1b
-0,       4500,       4500,       41,     1023, 0xd1dbd506
-0,       4541,       4541,       41,      803, 0x935e775e
-0,       4583,       4583,       41,     1035, 0x6a220483
-0,       4625,       4625,       41,      466, 0xd88bb237
+0,       4375,       4375,       41,     1037, 0xcf09dd3d, F=0x0
+0,       4416,       4416,       41,     1005, 0xe780cf1f, F=0x0
+0,       4458,       4458,       41,      890, 0x8b1d8c1b, F=0x0
+0,       4500,       4500,       41,     1023, 0xd1dbd506, F=0x0
+0,       4541,       4541,       41,      803, 0x935e775e, F=0x0
+0,       4583,       4583,       41,     1035, 0x6a220483, F=0x0
+0,       4625,       4625,       41,      466, 0xd88bb237, F=0x0
 1,       4789,       4789,        0,     1088, 0x09115bae
-0,       4916,       4916,       41,      945, 0x8f2eb1ec
+0,       4916,       4916,       41,      945, 0x8f2eb1ec, F=0x0
 0,       4958,       4958,       41,     1190, 0x4c451c1b
-0,       5000,       5000,       41,     1811, 0x727c52cb
-0,       5041,       5041,       41,     1552, 0x73f82bff
-0,       5083,       5083,       41,     1544, 0xa7241ece
-0,       5125,       5125,       41,     1707, 0x3d1a6464
-0,       5166,       5166,       41,     1103, 0x06b22710
-0,       5208,       5208,       41,     1122, 0x656725b8
+0,       5000,       5000,       41,     1811, 0x727c52cb, F=0x0
+0,       5041,       5041,       41,     1552, 0x73f82bff, F=0x0
+0,       5083,       5083,       41,     1544, 0xa7241ece, F=0x0
+0,       5125,       5125,       41,     1707, 0x3d1a6464, F=0x0
+0,       5166,       5166,       41,     1103, 0x06b22710, F=0x0
+0,       5208,       5208,       41,     1122, 0x656725b8, F=0x0
 1,       5224,       5224,        0,     1088, 0x0c8b9372
-0,       5250,       5250,       41,     1150, 0xf9674678
-0,       5291,       5291,       41,     1438, 0x03fac426
-0,       5333,       5333,       41,     1623, 0x7adb1321
-0,       5375,       5375,       41,     1677, 0x0b9a3e62
-0,       5416,       5416,       41,     1124, 0x769c0ea2
-0,       5458,       5458,       41,     1221, 0xd942409f
-0,       5500,       5500,       41,     1698, 0xd7ca3fe3
-0,       5541,       5541,       41,     1262, 0xb994692f
-0,       5583,       5583,       41,     2097, 0xf4eb663f
-0,       5625,       5625,       41,     1251, 0xfd4f633a
+0,       5250,       5250,       41,     1150, 0xf9674678, F=0x0
+0,       5291,       5291,       41,     1438, 0x03fac426, F=0x0
+0,       5333,       5333,       41,     1623, 0x7adb1321, F=0x0
+0,       5375,       5375,       41,     1677, 0x0b9a3e62, F=0x0
+0,       5416,       5416,       41,     1124, 0x769c0ea2, F=0x0
+0,       5458,       5458,       41,     1221, 0xd942409f, F=0x0
+0,       5500,       5500,       41,     1698, 0xd7ca3fe3, F=0x0
+0,       5541,       5541,       41,     1262, 0xb994692f, F=0x0
+0,       5583,       5583,       41,     2097, 0xf4eb663f, F=0x0
+0,       5625,       5625,       41,     1251, 0xfd4f633a, F=0x0
 1,       5659,       5659,        0,     1088, 0x75a82540
-0,       5666,       5666,       41,     1633, 0xb7e1290e
-0,       5708,       5708,       41,     1739, 0xecd18c38
-0,       5750,       5750,       41,     1132, 0xc83e1828
-0,       5791,       5791,       41,      825, 0xdd02867c
-0,       5833,       5833,       41,      903, 0x349ba205
-0,       5875,       5875,       41,     1013, 0x1366ec2a
-0,       5916,       5916,       41,     1340, 0xeaa2a231
-0,       5958,       5958,       41,     1102, 0x82de2889
-0,       6000,       6000,       41,     1834, 0x59b99b92
+0,       5666,       5666,       41,     1633, 0xb7e1290e, F=0x0
+0,       5708,       5708,       41,     1739, 0xecd18c38, F=0x0
+0,       5750,       5750,       41,     1132, 0xc83e1828, F=0x0
+0,       5791,       5791,       41,      825, 0xdd02867c, F=0x0
+0,       5833,       5833,       41,      903, 0x349ba205, F=0x0
+0,       5875,       5875,       41,     1013, 0x1366ec2a, F=0x0
+0,       5916,       5916,       41,     1340, 0xeaa2a231, F=0x0
+0,       5958,       5958,       41,     1102, 0x82de2889, F=0x0
+0,       6000,       6000,       41,     1834, 0x59b99b92, F=0x0
 1,       6008,       6008,        0,     1088, 0x690312b0
-0,       6041,       6041,       41,     1332, 0x0610813a
-0,       6083,       6083,       41,     1275, 0x5b0d7be7
-0,       6125,       6125,       41,     1376, 0xd915b0fe
-0,       6166,       6166,       41,     1417, 0x8606b34a
-0,       6208,       6208,       41,     1360, 0x3bcd93d3
-0,       6250,       6250,       41,     1330, 0xd0439c93
-0,       6291,       6291,       41,     1562, 0xb2560a09
+0,       6041,       6041,       41,     1332, 0x0610813a, F=0x0
+0,       6083,       6083,       41,     1275, 0x5b0d7be7, F=0x0
+0,       6125,       6125,       41,     1376, 0xd915b0fe, F=0x0
+0,       6166,       6166,       41,     1417, 0x8606b34a, F=0x0
+0,       6208,       6208,       41,     1360, 0x3bcd93d3, F=0x0
+0,       6250,       6250,       41,     1330, 0xd0439c93, F=0x0
+0,       6291,       6291,       41,     1562, 0xb2560a09, F=0x0
 1,       6312,       6312,        0,     1088, 0x76d50ff3
-0,       6333,       6333,       41,     1376, 0x4f9eb447
-0,       6375,       6375,       41,     1405, 0x85d3b084
-0,       6416,       6416,       41,     1344, 0xcdbda2ae
-0,       6458,       6458,       41,     1313, 0xe3067b35
-0,       6500,       6500,       41,     1459, 0xf9d2c56f
-0,       6541,       6541,       41,     1275, 0xf5536d81
-0,       6583,       6583,       41,     1209, 0x3b5b4ea5
+0,       6333,       6333,       41,     1376, 0x4f9eb447, F=0x0
+0,       6375,       6375,       41,     1405, 0x85d3b084, F=0x0
+0,       6416,       6416,       41,     1344, 0xcdbda2ae, F=0x0
+0,       6458,       6458,       41,     1313, 0xe3067b35, F=0x0
+0,       6500,       6500,       41,     1459, 0xf9d2c56f, F=0x0
+0,       6541,       6541,       41,     1275, 0xf5536d81, F=0x0
+0,       6583,       6583,       41,     1209, 0x3b5b4ea5, F=0x0
 1,       6595,       6595,        0,     1088, 0x8766276f
-0,       6625,       6625,       41,     1352, 0x7b199d28
-0,       6666,       6666,       41,     1349, 0x02adaaf3
-0,       6708,       6708,       41,     1464, 0x20d7cfd2
-0,       6750,       6750,       41,     1377, 0x78e0b1f4
-0,       6791,       6791,       41,      289, 0x1f2e9246
+0,       6625,       6625,       41,     1352, 0x7b199d28, F=0x0
+0,       6666,       6666,       41,     1349, 0x02adaaf3, F=0x0
+0,       6708,       6708,       41,     1464, 0x20d7cfd2, F=0x0
+0,       6750,       6750,       41,     1377, 0x78e0b1f4, F=0x0
+0,       6791,       6791,       41,      289, 0x1f2e9246, F=0x0
 1,       6878,       6878,        0,     1088, 0x678f20fd
 1,       7161,       7161,        0,     1088, 0x718afa20
 1,       7444,       7444,        0,     1088, 0x758f0939
diff --git a/tests/ref/fate/wtv-demux b/tests/ref/fate/wtv-demux
index fadc4ef..362c55b 100644
--- a/tests/ref/fate/wtv-demux
+++ b/tests/ref/fate/wtv-demux
@@ -38,104 +38,104 @@
 0,    8286442,    9486442,   400000,    41980, 0xd4920915
 1,    8399998,    8399998,   240000,      576, 0x05131eb0
 1,    8639998,    8639998,   240000,      576, 0x78151c22
-0,    8686442,    8686442,   400000,     7228, 0x1b141fa3
+0,    8686442,    8686442,   400000,     7228, 0x1b141fa3, F=0x0
 1,    8879998,    8879998,   240000,      576, 0x31771239
-0,    9086331,    9086331,   400000,     7492, 0x1a47f3e4
+0,    9086331,    9086331,   400000,     7492, 0x1a47f3e4, F=0x0
 1,    9119998,    9119998,   240000,      576, 0x3ce4097c
 1,    9359998,    9359998,   240000,      576, 0x180e15f4
-0,    9486442,   10686331,   400000,    25068, 0xcb70a744
+0,    9486442,   10686331,   400000,    25068, 0xcb70a744, F=0x0
 1,    9599998,    9599998,   240000,      576, 0x30db0604
 1,    9839998,    9839998,   240000,      576, 0x9b290284
-0,    9886442,    9886442,   400000,     7212, 0x0ab9f558
+0,    9886442,    9886442,   400000,     7212, 0x0ab9f558, F=0x0
 1,   10079998,   10079998,   240000,      576, 0xcf340753
-0,   10286442,   10286442,   400000,     7612, 0xa93054f0
+0,   10286442,   10286442,   400000,     7612, 0xa93054f0, F=0x0
 1,   10319998,   10319998,   240000,      576, 0xdaa41457
 1,   10559998,   10559998,   240000,      576, 0x34d310a2
-0,   10686331,   11886331,   400000,    22868, 0xa77db64a
+0,   10686331,   11886331,   400000,    22868, 0xa77db64a, F=0x0
 1,   10799998,   10799998,   240000,      576, 0x58b31010
 1,   11039998,   11039998,   240000,      576, 0x19610f54
-0,   11086442,   11086442,   400000,     6260, 0x6cf76411
+0,   11086442,   11086442,   400000,     6260, 0x6cf76411, F=0x0
 1,   11279998,   11279998,   240000,      576, 0x17762352
-0,   11486331,   11486331,   400000,     6156, 0xe168394b
+0,   11486331,   11486331,   400000,     6156, 0xe168394b, F=0x0
 1,   11519998,   11519998,   240000,      576, 0x1fea1448
 1,   11759998,   11759998,   240000,      576, 0x55840a01
-0,   11886331,   13086442,   400000,    23364, 0x53164f1e
+0,   11886331,   13086442,   400000,    23364, 0x53164f1e, F=0x0
 1,   11999998,   11999998,   240000,      576, 0x6c9c24ce
 1,   12239998,   12239998,   240000,      576, 0x955f1e97
-0,   12286442,   12286442,   400000,     6708, 0x89877269
+0,   12286442,   12286442,   400000,     6708, 0x89877269, F=0x0
 1,   12479998,   12479998,   240000,      576, 0x2827134f
-0,   12686442,   12686442,   400000,     6908, 0x8d62a249
+0,   12686442,   12686442,   400000,     6908, 0x8d62a249, F=0x0
 1,   12719998,   12719998,   240000,      576, 0x34a01c29
 1,   12959998,   12959998,   240000,      576, 0x7d351e52
 0,   13086442,   14286442,   400000,    38156, 0xec41f682
 1,   13199998,   13199998,   240000,      576, 0x00c91d9e
 1,   13439998,   13439998,   240000,      576, 0x57ea1a97
-0,   13486331,   13486331,   400000,     5764, 0xcc04534b
+0,   13486331,   13486331,   400000,     5764, 0xcc04534b, F=0x0
 1,   13679998,   13679998,   240000,      576, 0xef3a1c74
-0,   13886331,   13886331,   400000,     5388, 0xb8a1c3c5
+0,   13886331,   13886331,   400000,     5388, 0xb8a1c3c5, F=0x0
 1,   13919998,   13919998,   240000,      576, 0x11fc217d
 1,   14159998,   14159998,   240000,      576, 0x59ce20e5
-0,   14286442,   15486331,   400000,    16764, 0x59460d96
+0,   14286442,   15486331,   400000,    16764, 0x59460d96, F=0x0
 1,   14399998,   14399998,   240000,      576, 0xaafc1dbf
 1,   14639998,   14639998,   240000,      576, 0xdd941609
-0,   14686331,   14686331,   400000,     5548, 0x5c91e93d
+0,   14686331,   14686331,   400000,     5548, 0x5c91e93d, F=0x0
 1,   14879998,   14879998,   240000,      576, 0x900420b0
-0,   15086331,   15086331,   400000,     5652, 0x5e321aed
+0,   15086331,   15086331,   400000,     5652, 0x5e321aed, F=0x0
 1,   15119998,   15119998,   240000,      576, 0x5f4f1aa1
 1,   15359998,   15359998,   240000,      576, 0x7d7e18de
-0,   15486331,   16686331,   400000,    15564, 0xefdf5080
+0,   15486331,   16686331,   400000,    15564, 0xefdf5080, F=0x0
 1,   15599998,   15599998,   240000,      576, 0x986c0d9d
 1,   15839998,   15839998,   240000,      576, 0xcb4c21c0
-0,   15886331,   15886331,   400000,     6492, 0xd1d5c5f8
+0,   15886331,   15886331,   400000,     6492, 0xd1d5c5f8, F=0x0
 1,   16079998,   16079998,   240000,      576, 0xbcfb1e8b
-0,   16286331,   16286331,   400000,     5604, 0xf9472b44
+0,   16286331,   16286331,   400000,     5604, 0xf9472b44, F=0x0
 1,   16319998,   16319998,   240000,      576, 0xcb541b4c
 1,   16559998,   16559998,   240000,      576, 0x980426e9
-0,   16686331,   17886331,   400000,    17924, 0x45815b7b
+0,   16686331,   17886331,   400000,    17924, 0x45815b7b, F=0x0
 1,   16799998,   16799998,   240000,      576, 0x09d00aa0
 1,   17039998,   17039998,   240000,      576, 0xad591374
-0,   17086442,   17086442,   400000,     5020, 0x3cc5e554
+0,   17086442,   17086442,   400000,     5020, 0x3cc5e554, F=0x0
 1,   17279998,   17279998,   240000,      576, 0x97bf1461
-0,   17486442,   17486442,   400000,     5276, 0xa0554c12
+0,   17486442,   17486442,   400000,     5276, 0xa0554c12, F=0x0
 1,   17519998,   17519998,   240000,      576, 0xdc871cc4
 1,   17759998,   17759998,   240000,      576, 0x56781896
 0,   17886331,   19086442,   400000,    31460, 0x5765eb5f
 1,   17999998,   17999998,   240000,      576, 0xc77714e3
 1,   18239998,   18239998,   240000,      576, 0x280e18d4
-0,   18286331,   18286331,   400000,     4972, 0x91adbab7
+0,   18286331,   18286331,   400000,     4972, 0x91adbab7, F=0x0
 1,   18479998,   18479998,   240000,      576, 0xbc0d2302
-0,   18686442,   18686442,   400000,     5580, 0xfea707cb
+0,   18686442,   18686442,   400000,     5580, 0xfea707cb, F=0x0
 1,   18719998,   18719998,   240000,      576, 0x79191384
 1,   18959998,   18959998,   240000,      576, 0x65481c97
-0,   19086442,   20286331,   400000,    17412, 0x0afe4d27
+0,   19086442,   20286331,   400000,    17412, 0x0afe4d27, F=0x0
 1,   19199998,   19199998,   240000,      576, 0xc94d227d
 1,   19439998,   19439998,   240000,      576, 0xa68a1f14
-0,   19486442,   19486442,   400000,     5236, 0x03f55309
+0,   19486442,   19486442,   400000,     5236, 0x03f55309, F=0x0
 1,   19679998,   19679998,   240000,      576, 0x6af11a5c
-0,   19886331,   19886331,   400000,     4924, 0x558e753c
+0,   19886331,   19886331,   400000,     4924, 0x558e753c, F=0x0
 1,   19919998,   19919998,   240000,      576, 0x4d1019ef
 1,   20159998,   20159998,   240000,      576, 0x3b1b17b5
-0,   20286331,   21486331,   400000,    15396, 0xf145d121
+0,   20286331,   21486331,   400000,    15396, 0xf145d121, F=0x0
 1,   20399998,   20399998,   240000,      576, 0xcdd8159f
 1,   20639998,   20639998,   240000,      576, 0x97cd1d06
-0,   20686331,   20686331,   400000,     4708, 0x43066a92
+0,   20686331,   20686331,   400000,     4708, 0x43066a92, F=0x0
 1,   20879998,   20879998,   240000,      576, 0x5d1b1123
-0,   21086442,   21086442,   400000,     4332, 0x9e22bcba
+0,   21086442,   21086442,   400000,     4332, 0x9e22bcba, F=0x0
 1,   21119998,   21119998,   240000,      576, 0x888d0cb0
 1,   21359998,   21359998,   240000,      576, 0x556e1dad
-0,   21486331,   22686442,   400000,    12876, 0x46ff9ef4
+0,   21486331,   22686442,   400000,    12876, 0x46ff9ef4, F=0x0
 1,   21599998,   21599998,   240000,      576, 0xf7af0bce
 1,   21839998,   21839998,   240000,      576, 0xb5da160a
-0,   21886442,   21886442,   400000,     5940, 0x27cba62e
+0,   21886442,   21886442,   400000,     5940, 0x27cba62e, F=0x0
 1,   22079998,   22079998,   240000,      576, 0x4a8d0e98
-0,   22286442,   22286442,   400000,     6124, 0x6bab0a6d
+0,   22286442,   22286442,   400000,     6124, 0x6bab0a6d, F=0x0
 1,   22319998,   22319998,   240000,      576, 0x183b1c7e
 1,   22559998,   22559998,   240000,      576, 0xc47120e6
 0,   22686442,   23886442,   400000,    36428, 0x942f9648
 1,   22799998,   22799998,   240000,      576, 0xb1f31346
-0,   23086331,   23086331,   400000,     6660, 0x545a0db7
-0,   23486331,   23486331,   400000,     6780, 0x2d1d4189
-0,   23886442,   25086331,   400000,    16460, 0x7c3b3ca4
-0,   24286442,   24286442,   400000,     6724, 0x8538cc6f
-0,   24686442,   24686442,   400000,     7068, 0x69574fd0
-0,   25086331,   26286331,   400000,    19552, 0xf230e854
+0,   23086331,   23086331,   400000,     6660, 0x545a0db7, F=0x0
+0,   23486331,   23486331,   400000,     6780, 0x2d1d4189, F=0x0
+0,   23886442,   25086331,   400000,    16460, 0x7c3b3ca4, F=0x0
+0,   24286442,   24286442,   400000,     6724, 0x8538cc6f, F=0x0
+0,   24686442,   24686442,   400000,     7068, 0x69574fd0, F=0x0
+0,   25086331,   26286331,   400000,    19552, 0xf230e854, F=0x0
diff --git a/tests/ref/fate/xmv-demux b/tests/ref/fate/xmv-demux
index 841ba9c..49f22c9 100644
--- a/tests/ref/fate/xmv-demux
+++ b/tests/ref/fate/xmv-demux
@@ -7,32 +7,32 @@
 1,        249,        249,       83,     5976, 0x4ea056f4
 1,        332,        332,       83,     5976, 0xda772d8d
 1,        415,        415,       83,     5976, 0xafacf7c9
-0,        640,        640,        0,      108, 0x06713c96
-0,        680,        680,        0,      952, 0xd306df7e
-0,        720,        720,        0,     2312, 0xaf316585
+0,        640,        640,        0,      108, 0x06713c96, F=0x0
+0,        680,        680,        0,      952, 0xd306df7e, F=0x0
+0,        720,        720,        0,     2312, 0xaf316585, F=0x0
 1,        498,        498,       83,     5976, 0xdeb003f4
-0,        760,        760,        0,     3872, 0xfc1c527c
-0,        800,        800,        0,       20, 0xaffc0edd
-0,        840,        840,        0,     6600, 0xe1b66c7f
+0,        760,        760,        0,     3872, 0xfc1c527c, F=0x0
+0,        800,        800,        0,       20, 0xaffc0edd, F=0x0
+0,        840,        840,        0,     6600, 0xe1b66c7f, F=0x0
 1,        581,        581,       28,     2016, 0xa7380d36
-0,        880,        880,        0,     6868, 0xd5b3f631
+0,        880,        880,        0,     6868, 0xd5b3f631, F=0x0
 1,        609,        609,       28,     2016, 0xbc090bac
-0,        920,        920,        0,     8420, 0xf70ee33b
+0,        920,        920,        0,     8420, 0xf70ee33b, F=0x0
 1,        637,        637,       28,     2016, 0x6f8c164c
-0,        960,        960,        0,    13144, 0x9a54ef39
+0,        960,        960,        0,    13144, 0x9a54ef39, F=0x0
 1,        665,        665,       28,     2016, 0x13b80e28
-0,       1000,       1000,        0,     6340, 0xe55bf555
+0,       1000,       1000,        0,     6340, 0xe55bf555, F=0x0
 1,        693,        693,       28,     2016, 0xd40ff863
-0,       1040,       1040,        0,     3736, 0x0b23f89f
+0,       1040,       1040,        0,     3736, 0x0b23f89f, F=0x0
 1,        721,        721,       28,     2016, 0x4d530ed7
-0,       1080,       1080,        0,     2624, 0x79e2e451
+0,       1080,       1080,        0,     2624, 0x79e2e451, F=0x0
 1,        749,        749,       30,     2160, 0x0fbc37eb
-0,       1120,       1120,        0,     1860, 0x63886f11
+0,       1120,       1120,        0,     1860, 0x63886f11, F=0x0
 1,        779,        779,      192,    13824, 0x82fb2602
-0,       1160,       1160,        0,     1244, 0x74594601
-0,       1200,       1200,        0,      564, 0xf4561dfb
-0,       1240,       1240,        0,       80, 0xbf8e2e30
-0,       1280,       1280,        0,       20, 0xa0990c29
+0,       1160,       1160,        0,     1244, 0x74594601, F=0x0
+0,       1200,       1200,        0,      564, 0xf4561dfb, F=0x0
+0,       1240,       1240,        0,       80, 0xbf8e2e30, F=0x0
+0,       1280,       1280,        0,       20, 0xa0990c29, F=0x0
 1,        971,        971,      192,    13824, 0x08771caf
 1,       1163,       1163,      192,    13824, 0xdf7d4a65
 1,       1355,       1355,      193,    13896, 0x24bf3f47
@@ -40,35 +40,35 @@
 1,       1598,       1598,       50,     3600, 0x8c666fd6
 1,       1648,       1648,       50,     3600, 0x305c6ca1
 1,       1698,       1698,       50,     3600, 0x48b04e1e
-0,       2480,       2480,        0,      104, 0x12413980
-0,       2520,       2520,        0,      796, 0x2e698ed3
+0,       2480,       2480,        0,      104, 0x12413980, F=0x0
+0,       2520,       2520,        0,      796, 0x2e698ed3, F=0x0
 1,       1748,       1748,       50,     3600, 0x8c915935
-0,       2560,       2560,        0,     1808, 0x8b3e6e5e
-0,       2600,       2600,        0,     4712, 0xdbd51737
+0,       2560,       2560,        0,     1808, 0x8b3e6e5e, F=0x0
+0,       2600,       2600,        0,     4712, 0xdbd51737, F=0x0
 1,       1798,       1798,       50,     3600, 0xa8f45e01
-0,       2640,       2640,        0,     5548, 0xee9c831c
-0,       2680,       2680,        0,     6152, 0x9c18ccc1
+0,       2640,       2640,        0,     5548, 0xee9c831c, F=0x0
+0,       2680,       2680,        0,     6152, 0x9c18ccc1, F=0x0
 1,       1848,       1848,       53,     3816, 0xc64cc5ed
-0,       2720,       2720,        0,     6452, 0x7860462a
+0,       2720,       2720,        0,     6452, 0x7860462a, F=0x0
 1,       1901,       1901,       27,     1944, 0x0ac2e3f1
-0,       2760,       2760,        0,     6676, 0xe1b1c9e4
+0,       2760,       2760,        0,     6676, 0xe1b1c9e4, F=0x0
 1,       1928,       1928,       27,     1944, 0x2197dccd
-0,       2800,       2800,        0,    10904, 0x0bded7b7
+0,       2800,       2800,        0,    10904, 0x0bded7b7, F=0x0
 1,       1955,       1955,       27,     1944, 0x0c02e77f
-0,       2840,       2840,        0,    12844, 0xe6d16cff
+0,       2840,       2840,        0,    12844, 0xe6d16cff, F=0x0
 1,       1982,       1982,       27,     1944, 0x675ee06a
-0,       2880,       2880,        0,    10920, 0xe114c46b
+0,       2880,       2880,        0,    10920, 0xe114c46b, F=0x0
 1,       2009,       2009,       30,     2160, 0x0d803a8b
-0,       2920,       2920,        0,     5952, 0xb7464634
+0,       2920,       2920,        0,     5952, 0xb7464634, F=0x0
 1,       2039,       2039,       93,     6696, 0xa7a0dfea
-0,       2960,       2960,        0,     4732, 0x2fa2e36d
-0,       3000,       3000,        0,     2592, 0xf54ddd57
-0,       3040,       3040,        0,     1516, 0x4a1cd4d5
-0,       3080,       3080,        0,      864, 0x49889afc
+0,       2960,       2960,        0,     4732, 0x2fa2e36d, F=0x0
+0,       3000,       3000,        0,     2592, 0xf54ddd57, F=0x0
+0,       3040,       3040,        0,     1516, 0x4a1cd4d5, F=0x0
+0,       3080,       3080,        0,      864, 0x49889afc, F=0x0
 1,       2132,       2132,       93,     6696, 0x59aa3145
-0,       3120,       3120,        0,      468, 0x3932e6a4
-0,       3160,       3160,        0,      116, 0x2b8341e6
-0,       3200,       3200,        0,       16, 0x6a3109cf
+0,       3120,       3120,        0,      468, 0x3932e6a4, F=0x0
+0,       3160,       3160,        0,      116, 0x2b8341e6, F=0x0
+0,       3200,       3200,        0,       16, 0x6a3109cf, F=0x0
 1,       2225,       2225,       93,     6696, 0x69be4d78
 1,       2318,       2318,       93,     6696, 0x64064c67
 1,       2411,       2411,       93,     6696, 0xc8536f98
@@ -80,104 +80,104 @@
 1,       2937,       2937,      123,     8856, 0x19e18797
 1,       3060,       3060,      123,     8856, 0x0a0c7fbd
 1,       3183,       3183,      124,     8928, 0x4a9b2d42
-0,       4640,       4640,        0,      100, 0x45023894
-0,       4680,       4680,        0,      948, 0xa65ed345
-0,       4720,       4720,        0,     2808, 0xd7285746
-0,       4760,       4760,       40,     5372, 0x05794175
+0,       4640,       4640,        0,      100, 0x45023894, F=0x0
+0,       4680,       4680,        0,      948, 0xa65ed345, F=0x0
+0,       4720,       4720,        0,     2808, 0xd7285746, F=0x0
+0,       4760,       4760,       40,     5372, 0x05794175, F=0x0
 1,       3307,       3307,       21,     1512, 0xed8b3f4b
-0,       4800,       4800,       40,    11596, 0x8636eca7
+0,       4800,       4800,       40,    11596, 0x8636eca7, F=0x0
 1,       3328,       3328,       21,     1512, 0xa27d3891
-0,       4840,       4840,       40,    11524, 0xe1f39be3
+0,       4840,       4840,       40,    11524, 0xe1f39be3, F=0x0
 1,       3349,       3349,       21,     1512, 0xb0f13eb6
-0,       4880,       4880,       40,    23392, 0xab053f05
+0,       4880,       4880,       40,    23392, 0xab053f05, F=0x0
 1,       3370,       3370,       23,     1656, 0xe5a98324
-0,       4920,       4920,       40,     4560, 0x03197d07
+0,       4920,       4920,       40,     4560, 0x03197d07, F=0x0
 1,       3393,       3393,       31,     2232, 0x15445433
-0,       4960,       4960,       40,     4440, 0x1cc361a2
+0,       4960,       4960,       40,     4440, 0x1cc361a2, F=0x0
 1,       3424,       3424,       31,     2232, 0x5cb348a9
-0,       5000,       5000,       40,    23688, 0x16030634
+0,       5000,       5000,       40,    23688, 0x16030634, F=0x0
 1,       3455,       3455,       31,     2232, 0xf10347da
-0,       5040,       5040,       40,    16132, 0xf0eca799
+0,       5040,       5040,       40,    16132, 0xf0eca799, F=0x0
 1,       3486,       3486,       34,     2448, 0x3e16a175
-0,       5080,       5080,       40,    29896, 0x0c0988ea
+0,       5080,       5080,       40,    29896, 0x0c0988ea, F=0x0
 1,       3520,       3520,       35,     2520, 0x17e3ca2b
-0,       5120,       5120,       40,    19956, 0x0093aa0b
+0,       5120,       5120,       40,    19956, 0x0093aa0b, F=0x0
 1,       3555,       3555,       27,     1944, 0x35c2de84
-0,       5160,       5160,       40,    16392, 0x8829a9ca
+0,       5160,       5160,       40,    16392, 0x8829a9ca, F=0x0
 1,       3582,       3582,       27,     1944, 0x55b4db40
-0,       5200,       5200,       40,    16772, 0x9a4a546d
+0,       5200,       5200,       40,    16772, 0x9a4a546d, F=0x0
 1,       3609,       3609,       29,     2088, 0xdaae14b2
-0,       5240,       5240,       40,     8920, 0xcd8ca203
+0,       5240,       5240,       40,     8920, 0xcd8ca203, F=0x0
 1,       3638,       3638,       27,     1944, 0x92ccd37f
-0,       5280,       5280,       40,     9632, 0x53c1d37b
+0,       5280,       5280,       40,     9632, 0x53c1d37b, F=0x0
 1,       3665,       3665,       27,     1944, 0x70efede1
-0,       5320,       5320,       40,     8976, 0xfe4da2cc
+0,       5320,       5320,       40,     8976, 0xfe4da2cc, F=0x0
 1,       3692,       3692,       27,     1944, 0x7601d304
-0,       5360,       5360,       40,     6680, 0x35348fe0
+0,       5360,       5360,       40,     6680, 0x35348fe0, F=0x0
 1,       3719,       3719,       27,     1944, 0x3922ebc2
-0,       5400,       5400,       40,     9228, 0xcbf62b0c
+0,       5400,       5400,       40,     9228, 0xcbf62b0c, F=0x0
 1,       3746,       3746,       30,     2160, 0xde462f2e
-0,       5440,       5440,       40,     5108, 0xd1d88511
+0,       5440,       5440,       40,     5108, 0xd1d88511, F=0x0
 1,       3776,       3776,       26,     1872, 0x467ac1d2
-0,       5480,       5480,       40,    10016, 0xaff4b2b2
+0,       5480,       5480,       40,    10016, 0xaff4b2b2, F=0x0
 1,       3802,       3802,       26,     1872, 0xa1e4cd43
-0,       5520,       5520,       40,     7468, 0x23e81ab8
+0,       5520,       5520,       40,     7468, 0x23e81ab8, F=0x0
 1,       3828,       3828,       26,     1872, 0x1dceccc6
-0,       5560,       5560,       40,     4172, 0x253cd05b
+0,       5560,       5560,       40,     4172, 0x253cd05b, F=0x0
 1,       3854,       3854,       26,     1872, 0x2bbad2a5
-0,       5600,       5600,       40,     8188, 0x7ede743f
+0,       5600,       5600,       40,     8188, 0x7ede743f, F=0x0
 1,       3880,       3880,       26,     1872, 0xc603d44d
-0,       5640,       5640,       40,     2884, 0x2dec55a3
+0,       5640,       5640,       40,     2884, 0x2dec55a3, F=0x0
 1,       3906,       3906,       26,     1872, 0x1b4cc261
-0,       5680,       5680,       40,     3900, 0xd0666a18
+0,       5680,       5680,       40,     3900, 0xd0666a18, F=0x0
 1,       3932,       3932,       26,     1872, 0x10edd6cf
-0,       5720,       5720,       40,     2996, 0x9cc99b8c
+0,       5720,       5720,       40,     2996, 0x9cc99b8c, F=0x0
 1,       3958,       3958,       33,     2376, 0xecdb9d61
-0,       5760,       5760,       40,     2156, 0xae612776
+0,       5760,       5760,       40,     2156, 0xae612776, F=0x0
 1,       3991,       3991,       36,     2592, 0x5559eced
-0,       5800,       5800,       40,     3988, 0x0d2c9992
-0,       5840,       5840,       40,     1512, 0x6281fc00
+0,       5800,       5800,       40,     3988, 0x0d2c9992, F=0x0
+0,       5840,       5840,       40,     1512, 0x6281fc00, F=0x0
 1,       4027,       4027,       36,     2592, 0x8848dfc7
-0,       5880,       5880,       40,     6544, 0xb75c2562
+0,       5880,       5880,       40,     6544, 0xb75c2562, F=0x0
 1,       4063,       4063,       36,     2592, 0x4ca2d7da
-0,       5920,       5920,       40,     4108, 0xfb21efc9
+0,       5920,       5920,       40,     4108, 0xfb21efc9, F=0x0
 1,       4099,       4099,       36,     2592, 0x285fd7e6
-0,       5960,       5960,       40,     1096, 0x85922a37
-0,       6000,       6000,       40,     9740, 0xe57d7647
+0,       5960,       5960,       40,     1096, 0x85922a37, F=0x0
+0,       6000,       6000,       40,     9740, 0xe57d7647, F=0x0
 1,       4135,       4135,       36,     2592, 0x2717e404
-0,       6040,       6040,       40,      416, 0x61c2ea02
+0,       6040,       6040,       40,      416, 0x61c2ea02, F=0x0
 1,       4171,       4171,       36,     2592, 0xf106111a
-0,       6080,       6080,       40,      336, 0x1dc5ac1c
+0,       6080,       6080,       40,      336, 0x1dc5ac1c, F=0x0
 1,       4207,       4207,       36,     2592, 0xd7d01119
-0,       6120,       6120,       40,      204, 0x16f57017
+0,       6120,       6120,       40,      204, 0x16f57017, F=0x0
 1,       4243,       4243,       36,     2592, 0x550cfeda
-0,       6160,       6160,       40,      112, 0x78374234
-0,       6200,       6200,       40,       40, 0x6cb21985
+0,       6160,       6160,       40,      112, 0x78374234, F=0x0
+0,       6200,       6200,       40,       40, 0x6cb21985, F=0x0
 1,       4279,       4279,       36,     2592, 0x47ad00c4
 1,       4315,       4315,       36,     2592, 0x39bbf306
 1,       4351,       4351,       45,     3240, 0x69addfce
 1,       4396,       4396,      297,    21384, 0x254f63e0
 1,       4693,       4693,      298,    21456, 0x2f7a9859
-0,       6840,       6840,       40,    14420, 0x53324ca4
-0,       6880,       6880,       40,       40, 0x10971420
+0,       6840,       6840,       40,    14420, 0x53324ca4, F=0x0
+0,       6880,       6880,       40,       40, 0x10971420, F=0x0
 1,       4991,       4991,      521,    37512, 0x6e962928
 1,       5512,       5512,       38,     2736, 0x1dc91c69
 0,       8000,       8000,       40,    24904, 0x15574f7e
 1,       5550,       5550,       38,     2736, 0x023434fd
 1,       5588,       5588,       38,     2736, 0x906f1541
-0,       8160,       8160,       40,     1908, 0xccb2dd3c
+0,       8160,       8160,       40,     1908, 0xccb2dd3c, F=0x0
 1,       5626,       5626,       38,     2736, 0x85a31102
-0,       8200,       8200,       40,     4676, 0xbfa42b7e
+0,       8200,       8200,       40,     4676, 0xbfa42b7e, F=0x0
 1,       5664,       5664,       42,     3024, 0x9296a5f3
-0,       8240,       8240,       40,     3600, 0x87c9dc58
-0,       8280,       8280,       40,     8184, 0x504a8e65
+0,       8240,       8240,       40,     3600, 0x87c9dc58, F=0x0
+0,       8280,       8280,       40,     8184, 0x504a8e65, F=0x0
 1,       5706,       5706,       27,     1944, 0x7bf4dedc
-0,       8320,       8320,       40,     9636, 0x2efb3006
+0,       8320,       8320,       40,     9636, 0x2efb3006, F=0x0
 1,       5733,       5733,       27,     1944, 0x4196c404
 1,       5760,       5760,       27,     1944, 0xcda97c7a
-0,       8360,       8360,       40,     9580, 0x0fb6f4e8
+0,       8360,       8360,       40,     9580, 0x0fb6f4e8, F=0x0
 1,       5787,       5787,       27,     1944, 0x5f4922b2
-0,       8400,       8400,       40,     7840, 0xe996f564
+0,       8400,       8400,       40,     7840, 0xe996f564, F=0x0
 1,       5814,       5814,       29,     2088, 0x37dfc157
-0,       8440,       8440,       40,     4208, 0xe9c2fba2
-0,       8480,       8480,       40,      556, 0x3f1e077c
+0,       8440,       8440,       40,     4208, 0xe9c2fba2, F=0x0
+0,       8480,       8480,       40,      556, 0x3f1e077c, F=0x0
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list