avformat/mxfenc: Add Padding Bits
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 5 Apr 2018 21:30:37 +0000 (23:30 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 8 May 2018 21:02:58 +0000 (23:02 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
20 files changed:
libavformat/mxfenc.c
tests/ref/fate/concat-demuxer-extended-lavf-mxf
tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
tests/ref/fate/concat-demuxer-simple1-lavf-mxf
tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
tests/ref/fate/copy-trac4914
tests/ref/fate/mxf-reel_name
tests/ref/fate/time_base
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10
tests/ref/lavf/mxf_dv25
tests/ref/lavf/mxf_dvcpro50
tests/ref/lavf/mxf_opatom
tests/ref/lavf/mxf_opatom_audio
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-mxf_d10
tests/ref/seek/lavf-mxf_dv25
tests/ref/seek/lavf-mxf_dvcpro50
tests/ref/seek/lavf-mxf_opatom
tests/ref/seek/lavf-mxf_opatom_audio

index 37121b9..80c3f93 100644 (file)
@@ -493,6 +493,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
     { 0x3302, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x05,0x00,0x00,0x00}}, /* Horizontal Subsampling */
     { 0x3308, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x01,0x10,0x00,0x00,0x00}}, /* Vertical Subsampling */
     { 0x3303, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x01,0x06,0x00,0x00,0x00}}, /* Color Siting */
+    { 0x3307, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x18,0x01,0x04,0x00,0x00,0x00,0x00}}, /* Padding Bits */
     { 0x3304, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x03,0x03,0x00,0x00,0x00}}, /* Black Ref level */
     { 0x3305, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x05,0x03,0x04,0x00,0x00,0x00}}, /* White Ref level */
     { 0x3306, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x05,0x03,0x05,0x00,0x00,0x00}}, /* Color Range */
@@ -1140,7 +1141,7 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke
     int stored_height = (st->codecpar->height+15)/16*16;
     int display_height;
     int f1, f2;
-    unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5;
+    unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5 + 6;
     if (sc->interlaced && sc->field_dominance)
         desc_size += 5;
     if (sc->signal_standard)
@@ -1193,6 +1194,10 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke
     mxf_write_local_tag(pb, 1, 0x3303);
     avio_w8(pb, sc->color_siting);
 
+    // Padding Bits
+    mxf_write_local_tag(pb, 2, 0x3307);
+    avio_wb16(pb, 0);
+
     if (st->codecpar->color_range != AVCOL_RANGE_UNSPECIFIED) {
         int black = 0,
             white = (1<<sc->component_depth) - 1,
index 13170c6..2fb5fce 100644 (file)
@@ -1 +1 @@
-7c8c500ea386b41e9025487fb4380f5c *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
+a6fb9c37dc71cb43eb9664a8ae9f1c66 *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
index c3c8591..60d729b 100644 (file)
@@ -1 +1 @@
-d87c3a2394c60046636e43848fa8b4f6 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
+cb7c8eac6f8917e39658e1fa4a250da8 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
index 4f1d12f..d18e35b 100644 (file)
-video|0|0|0.000000|-1|-0.040000|1|0.040000|N/A|N/A|24801|6656|K_
-audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|3840|31744|K_
-video|0|3|0.120000|0|0.000000|1|0.040000|N/A|N/A|16743|36352|__
-audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|3840|53248|K_
-video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|13812|57856|__
-audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|3840|72192|K_
-video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|13607|76800|__
-audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|3840|90624|K_
-video|0|6|0.240000|3|0.120000|1|0.040000|N/A|N/A|16158|95232|__
-audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|3840|111616|K_
-video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|13943|116224|__
-audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|3840|130560|K_
-video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|11223|135168|__
-audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|3840|146432|K_
-video|0|9|0.360000|6|0.240000|1|0.040000|N/A|N/A|20298|151040|__
-audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|3840|171520|K_
-video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|13341|176128|__
-audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|3840|189952|K_
-video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|12362|194560|__
-audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|3840|207360|K_
-video|0|12|0.480000|9|0.360000|1|0.040000|N/A|N/A|24786|211968|K_
-audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|3840|237056|K_
-video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|13377|241664|__
-audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|3840|255488|K_
-video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|15624|260096|__
-audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|3840|275968|K_
-video|0|15|0.600000|12|0.480000|1|0.040000|N/A|N/A|22597|280576|__
-audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|3840|303616|K_
-video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|15028|308224|__
-audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|3840|323584|K_
-video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|14014|328192|__
-audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|342528|K_
-video|0|18|0.720000|15|0.600000|1|0.040000|N/A|N/A|20731|347136|__
-audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|368128|K_
-video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|11946|372736|__
-audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|385024|K_
-video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|14464|389632|__
-audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|404480|K_
-video|0|21|0.840000|18|0.720000|1|0.040000|N/A|N/A|16189|409088|__
-audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|425472|K_
-video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|10524|430080|__
-audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|440832|K_
-video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|10599|445440|__
-audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|456192|K_
-video|0|24|0.960000|21|0.840000|1|0.040000|N/A|N/A|24711|460800|K_
-audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|485888|K_
-video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|10840|490496|__
-audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|501760|K_
-video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|13350|506368|__
-audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|520192|K_
-video|0|17|0.680000|14|0.560000|1|0.040000|N/A|N/A|24786|211968|K_
-audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|237056|K_
-video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|13377|241664|__
-audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|255488|K_
-video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|15624|260096|__
-audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|275968|K_
-video|0|20|0.800000|17|0.680000|1|0.040000|N/A|N/A|22597|280576|__
-audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|303616|K_
-video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|15028|308224|__
-audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|323584|K_
-video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|14014|328192|__
-audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|342528|K_
-video|0|23|0.920000|20|0.800000|1|0.040000|N/A|N/A|20731|347136|__
-audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|368128|K_
-video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|11946|372736|__
-audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|385024|K_
-video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|14464|389632|__
-audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|404480|K_
-video|0|26|1.040000|23|0.920000|1|0.040000|N/A|N/A|16189|409088|__
-audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|425472|K_
-video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|10524|430080|__
-audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|440832|K_
-video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|10599|445440|__
-audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|456192|K_
-video|0|29|1.160000|26|1.040000|1|0.040000|N/A|N/A|24711|460800|K_
-audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|485888|K_
-video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|10840|490496|__
-audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|501760|K_
-video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|13350|506368|__
-audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|520192|K_
-video|0|25|1.000000|24|0.960000|1|0.040000|N/A|N/A|24801|6656|K_|1
-Strings Metadata
-audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|31744|K_|1
-Strings Metadata
-video|0|28|1.120000|25|1.000000|1|0.040000|N/A|N/A|16743|36352|__|1
-Strings Metadata
-audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|53248|K_|1
-Strings Metadata
-video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|13812|57856|__|1
-Strings Metadata
-audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|72192|K_|1
-Strings Metadata
-video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|13607|76800|__|1
-Strings Metadata
-audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|90624|K_|1
-Strings Metadata
-video|0|31|1.240000|28|1.120000|1|0.040000|N/A|N/A|16158|95232|__|1
-Strings Metadata
-audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|111616|K_|1
-Strings Metadata
-video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|13943|116224|__|1
-Strings Metadata
-audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|3840|130560|K_|1
-Strings Metadata
-video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|11223|135168|__|1
-Strings Metadata
-audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|3840|146432|K_|1
-Strings Metadata
-video|0|34|1.360000|31|1.240000|1|0.040000|N/A|N/A|20298|151040|__|1
-Strings Metadata
-audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|3840|171520|K_|1
-Strings Metadata
-video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|13341|176128|__|1
-Strings Metadata
-audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|3840|189952|K_|1
-Strings Metadata
-video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|12362|194560|__|1
-Strings Metadata
-audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|207360|K_|1
-Strings Metadata
-video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|211968|K_|1
+video|0|0|0.000000|-1|-0.040000|1|0.040000|N/A|N/A|24801|7168|K_
+audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|3840|32256|K_
+video|0|3|0.120000|0|0.000000|1|0.040000|N/A|N/A|16743|36864|__
+audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|3840|53760|K_
+video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|13812|58368|__
+audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|3840|72704|K_
+video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|13607|77312|__
+audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|3840|91136|K_
+video|0|6|0.240000|3|0.120000|1|0.040000|N/A|N/A|16158|95744|__
+audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|3840|112128|K_
+video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|13943|116736|__
+audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|3840|131072|K_
+video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|11223|135680|__
+audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|3840|146944|K_
+video|0|9|0.360000|6|0.240000|1|0.040000|N/A|N/A|20298|151552|__
+audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|3840|172032|K_
+video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|13341|176640|__
+audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|3840|190464|K_
+video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|12362|195072|__
+audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|3840|207872|K_
+video|0|12|0.480000|9|0.360000|1|0.040000|N/A|N/A|24786|212480|K_
+audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|3840|237568|K_
+video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|13377|242176|__
+audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|3840|256000|K_
+video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|15624|260608|__
+audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|3840|276480|K_
+video|0|15|0.600000|12|0.480000|1|0.040000|N/A|N/A|22597|281088|__
+audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|3840|304128|K_
+video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|15028|308736|__
+audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|3840|324096|K_
+video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|14014|328704|__
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|343040|K_
+video|0|18|0.720000|15|0.600000|1|0.040000|N/A|N/A|20731|347648|__
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|368640|K_
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|11946|373248|__
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|385536|K_
+video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|14464|390144|__
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|404992|K_
+video|0|21|0.840000|18|0.720000|1|0.040000|N/A|N/A|16189|409600|__
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|425984|K_
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|10524|430592|__
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|441344|K_
+video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|10599|445952|__
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|456704|K_
+video|0|24|0.960000|21|0.840000|1|0.040000|N/A|N/A|24711|461312|K_
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|486400|K_
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|10840|491008|__
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|502272|K_
+video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|13350|506880|__
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|520704|K_
+video|0|17|0.680000|14|0.560000|1|0.040000|N/A|N/A|24786|212480|K_
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|237568|K_
+video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|13377|242176|__
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|256000|K_
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|15624|260608|__
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|276480|K_
+video|0|20|0.800000|17|0.680000|1|0.040000|N/A|N/A|22597|281088|__
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|304128|K_
+video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|15028|308736|__
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|324096|K_
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|14014|328704|__
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|343040|K_
+video|0|23|0.920000|20|0.800000|1|0.040000|N/A|N/A|20731|347648|__
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|368640|K_
+video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|11946|373248|__
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|385536|K_
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|14464|390144|__
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|404992|K_
+video|0|26|1.040000|23|0.920000|1|0.040000|N/A|N/A|16189|409600|__
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|425984|K_
+video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|10524|430592|__
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|441344|K_
+video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|10599|445952|__
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|456704|K_
+video|0|29|1.160000|26|1.040000|1|0.040000|N/A|N/A|24711|461312|K_
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|486400|K_
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|10840|491008|__
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|502272|K_
+video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|13350|506880|__
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|520704|K_
+video|0|25|1.000000|24|0.960000|1|0.040000|N/A|N/A|24801|7168|K_|1
+Strings Metadata
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|32256|K_|1
+Strings Metadata
+video|0|28|1.120000|25|1.000000|1|0.040000|N/A|N/A|16743|36864|__|1
+Strings Metadata
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|53760|K_|1
+Strings Metadata
+video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|13812|58368|__|1
+Strings Metadata
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|72704|K_|1
+Strings Metadata
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|13607|77312|__|1
+Strings Metadata
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|91136|K_|1
+Strings Metadata
+video|0|31|1.240000|28|1.120000|1|0.040000|N/A|N/A|16158|95744|__|1
+Strings Metadata
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|112128|K_|1
+Strings Metadata
+video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|13943|116736|__|1
+Strings Metadata
+audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|3840|131072|K_|1
+Strings Metadata
+video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|11223|135680|__|1
+Strings Metadata
+audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|3840|146944|K_|1
+Strings Metadata
+video|0|34|1.360000|31|1.240000|1|0.040000|N/A|N/A|20298|151552|__|1
+Strings Metadata
+audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|3840|172032|K_|1
+Strings Metadata
+video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|13341|176640|__|1
+Strings Metadata
+audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|3840|190464|K_|1
+Strings Metadata
+video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|12362|195072|__|1
+Strings Metadata
+audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|207872|K_|1
+Strings Metadata
+video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|212480|K_|1
 Strings Metadata
 0|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
 1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
index f6da719..e83d1bf 100644 (file)
@@ -1,82 +1,82 @@
-video|0|0|0.000000|0|0.000000|1|0.040000|N/A|N/A|150000|6656|K_
-audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|7680|157184|K_
-video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|150000|219648|K_
-audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|7680|370176|K_
-video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|150000|432640|K_
-audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|7680|583168|K_
-video|0|3|0.120000|3|0.120000|1|0.040000|N/A|N/A|150000|645632|K_
-audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|7680|796160|K_
-video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|150000|858624|K_
-audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|7680|1009152|K_
-video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|150000|1071616|K_
-audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|7680|1222144|K_
-video|0|6|0.240000|6|0.240000|1|0.040000|N/A|N/A|150000|1284608|K_
-audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|7680|1435136|K_
-video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|150000|1497600|K_
-audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|7680|1648128|K_
-video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|150000|1710592|K_
-audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|7680|1861120|K_
-video|0|9|0.360000|9|0.360000|1|0.040000|N/A|N/A|150000|1923584|K_
-audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|7680|2074112|K_
-video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|150000|2136576|K_
-audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|7680|2287104|K_
-video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|150000|2349568|K_
-audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|7680|2500096|K_
-video|0|12|0.480000|12|0.480000|1|0.040000|N/A|N/A|150000|2562560|K_
-audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|7680|2713088|K_
-video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|150000|2775552|K_
-audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|7680|2926080|K_
-video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|150000|2988544|K_
-audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|7680|3139072|K_
-video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|150000|3201536|K_
-audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|7680|3352064|K_
-video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|150000|3414528|K_
-audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|7680|3565056|K_
-video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|150000|3627520|K_
-audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|7680|3778048|K_
-video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|150000|3840512|K_
-audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|7680|3991040|K_
-video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|150000|4053504|K_
-audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|7680|4204032|K_
-video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|150000|4266496|K_
-audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|7680|4417024|K_
-video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|150000|4479488|K_
-audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|7680|4630016|K_
-video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|150000|4692480|K_
-audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|7680|4843008|K_
-video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|150000|4905472|K_
-audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|7680|5056000|K_
-video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|150000|5118464|K_
-audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|7680|5268992|K_
-video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|150000|4266496|K_
-audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|7680|4417024|K_
-video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|150000|4479488|K_
-audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|7680|4630016|K_
-video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|150000|4692480|K_
-audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|7680|4843008|K_
-video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|150000|4905472|K_
-audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|7680|5056000|K_
-video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|150000|5118464|K_
-audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|7680|5268992|K_
-video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|150000|1071616|K_|1
+video|0|0|0.000000|0|0.000000|1|0.040000|N/A|N/A|150000|7168|K_
+audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|7680|157696|K_
+video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|150000|220160|K_
+audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|7680|370688|K_
+video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|150000|433152|K_
+audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|7680|583680|K_
+video|0|3|0.120000|3|0.120000|1|0.040000|N/A|N/A|150000|646144|K_
+audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|7680|796672|K_
+video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|150000|859136|K_
+audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|7680|1009664|K_
+video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|150000|1072128|K_
+audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|7680|1222656|K_
+video|0|6|0.240000|6|0.240000|1|0.040000|N/A|N/A|150000|1285120|K_
+audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|7680|1435648|K_
+video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|150000|1498112|K_
+audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|7680|1648640|K_
+video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|150000|1711104|K_
+audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|7680|1861632|K_
+video|0|9|0.360000|9|0.360000|1|0.040000|N/A|N/A|150000|1924096|K_
+audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|7680|2074624|K_
+video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|150000|2137088|K_
+audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|7680|2287616|K_
+video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|150000|2350080|K_
+audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|7680|2500608|K_
+video|0|12|0.480000|12|0.480000|1|0.040000|N/A|N/A|150000|2563072|K_
+audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|7680|2713600|K_
+video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|150000|2776064|K_
+audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|7680|2926592|K_
+video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|150000|2989056|K_
+audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|7680|3139584|K_
+video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|150000|3202048|K_
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|7680|3352576|K_
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|150000|3415040|K_
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|7680|3565568|K_
+video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|150000|3628032|K_
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|7680|3778560|K_
+video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|150000|3841024|K_
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|7680|3991552|K_
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|150000|4054016|K_
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|7680|4204544|K_
+video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|150000|4267008|K_
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|7680|4417536|K_
+video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|150000|4480000|K_
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|7680|4630528|K_
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|150000|4692992|K_
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|7680|4843520|K_
+video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|150000|4905984|K_
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|7680|5056512|K_
+video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|150000|5118976|K_
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|7680|5269504|K_
+video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|150000|4267008|K_
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|7680|4417536|K_
+video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|150000|4480000|K_
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|7680|4630528|K_
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|150000|4692992|K_
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|7680|4843520|K_
+video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|150000|4905984|K_
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|7680|5056512|K_
+video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|150000|5118976|K_
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|7680|5269504|K_
+video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|150000|1072128|K_|1
 Strings Metadata
-audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|7680|1222144|K_|1
+audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|7680|1222656|K_|1
 Strings Metadata
-video|0|31|1.240000|31|1.240000|1|0.040000|N/A|N/A|150000|1284608|K_|1
+video|0|31|1.240000|31|1.240000|1|0.040000|N/A|N/A|150000|1285120|K_|1
 Strings Metadata
-audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|7680|1435136|K_|1
+audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|7680|1435648|K_|1
 Strings Metadata
-video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|150000|1497600|K_|1
+video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|150000|1498112|K_|1
 Strings Metadata
-audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|7680|1648128|K_|1
+audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|7680|1648640|K_|1
 Strings Metadata
-video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|150000|1710592|K_|1
+video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|150000|1711104|K_|1
 Strings Metadata
-audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|7680|1861120|K_|1
+audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|7680|1861632|K_|1
 Strings Metadata
-video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1923584|K_|1
+video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1924096|K_|1
 Strings Metadata
-audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2074112|K_|1
+audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2074624|K_|1
 Strings Metadata
 0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
 1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
index 82f0e20..e9fafdc 100644 (file)
@@ -1,5 +1,5 @@
-413822e81bf2e8e15253c5f454dd4f89 *tests/data/fate/copy-trac4914.mxf
-561209 tests/data/fate/copy-trac4914.mxf
+d44bf57681071b6b45bb8bab782895af *tests/data/fate/copy-trac4914.mxf
+561721 tests/data/fate/copy-trac4914.mxf
 #tb 0: 1001/30000
 #media_type 0: video
 #codec_id 0: rawvideo
index 06eed08..41570da 100644 (file)
@@ -1 +1 @@
-af45493a137fefc30012b622e87655fb
+a5fdbd2155093f6eac0eaa2392cdb792
index ab73dc9..369d73c 100644 (file)
@@ -1 +1 @@
-a2af9615e99800d1a8d9d4beb52fde17
+90067b01fef77a4c5cad419bca2462b2
index c232602..098a3c2 100644 (file)
@@ -1,9 +1,9 @@
-b88e19419e438822ce844f2126ead987 *./tests/data/lavf/lavf.mxf
-525881 ./tests/data/lavf/lavf.mxf
+a530ecfc5521150f72ee3e735815d964 *./tests/data/lavf/lavf.mxf
+526393 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
-518a71066087fef4f24b0e1b3c1c31f0 *./tests/data/lavf/lavf.mxf
-561209 ./tests/data/lavf/lavf.mxf
+49a27701521b717dd501041f1e5a4476 *./tests/data/lavf/lavf.mxf
+561721 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0xf21b1b48
-cf62629801992052a4c6bfc4793ce489 *./tests/data/lavf/lavf.mxf
-525881 ./tests/data/lavf/lavf.mxf
+1a03fa10b8774749304af4cbedd8c4bd *./tests/data/lavf/lavf.mxf
+526393 ./tests/data/lavf/lavf.mxf
 ./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
index e34f57e..87214a8 100644 (file)
@@ -1,3 +1,3 @@
-4e54e7d5be04c5b7db145b2315d23771 *./tests/data/lavf/lavf.mxf_d10
-5331501 ./tests/data/lavf/lavf.mxf_d10
+cec3289b3a7a92b36a6d7f30a0251d91 *./tests/data/lavf/lavf.mxf_d10
+5332013 ./tests/data/lavf/lavf.mxf_d10
 ./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
index 7ba1003..1bba689 100644 (file)
@@ -1,3 +1,3 @@
-eb9eff93337cc2273cd01fa0e5416555 *./tests/data/lavf/lavf.mxf_dv25
-3833901 ./tests/data/lavf/lavf.mxf_dv25
+2e525e922e2809914983922e6a2f41f4 *./tests/data/lavf/lavf.mxf_dv25
+3834413 ./tests/data/lavf/lavf.mxf_dv25
 ./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52
index 3760830..d44ed37 100644 (file)
@@ -1,3 +1,3 @@
-1665f75a926581a3bc94723e95c16d08 *./tests/data/lavf/lavf.mxf_dvcpro50
-7430701 ./tests/data/lavf/lavf.mxf_dvcpro50
+a3d99dfeec77a06c9033f147b3d2d1f8 *./tests/data/lavf/lavf.mxf_dvcpro50
+7431213 ./tests/data/lavf/lavf.mxf_dvcpro50
 ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4
index da7596e..81dec69 100644 (file)
@@ -1,3 +1,3 @@
-69f093d69ba6bd61b3904c259e6f3817 *./tests/data/lavf/lavf.mxf_opatom
-4717113 ./tests/data/lavf/lavf.mxf_opatom
+9a34611080ea36a627fbbaebebcef930 *./tests/data/lavf/lavf.mxf_opatom
+4717625 ./tests/data/lavf/lavf.mxf_opatom
 ./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
index ad591f1..9694f73 100644 (file)
@@ -1,3 +1,3 @@
-2adc59eeb7f4ce094b735527cfd13bfb *./tests/data/lavf/lavf.mxf_opatom_audio
-102457 ./tests/data/lavf/lavf.mxf_opatom_audio
+5b74d1bcf272f26023a375bf778fae5e *./tests/data/lavf/lavf.mxf_opatom_audio
+102969 ./tests/data/lavf/lavf.mxf_opatom_audio
 ./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff
index ea0e0b6..495badd 100644 (file)
@@ -1,48 +1,48 @@
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret:-1         st: 1 flags:0  ts: 2.576667
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24786
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 212480 size: 24786
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret:-1         st: 0 flags:0  ts: 2.160000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24786
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 212480 size: 24786
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret:-1         st: 1 flags:0  ts: 1.306667
 ret: 0         st: 1 flags:1  ts: 0.200833
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
 ret:-1         st: 1 flags:0  ts: 2.671667
 ret: 0         st: 1 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24711
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 461312 size: 24711
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24786
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 212480 size: 24786
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6656 size: 24801
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   7168 size: 24801
index a154d34..ad3e4da 100644 (file)
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4266496 size:150000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4267008 size:150000
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1923584 size:150000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1924096 size:150000
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st: 0 flags:0  ts: 2.160000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3414528 size:150000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3415040 size:150000
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 1 flags:1  ts: 0.200833
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1071616 size:150000
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1072128 size:150000
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4692480 size:150000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4692992 size:150000
 ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
 ret: 0         st: 1 flags:0  ts: 2.671667
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st: 1 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118464 size:150000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:5118976 size:150000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2562560 size:150000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2563072 size:150000
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:150000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:150000
index 4ce49a4..755b847 100644 (file)
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3681280 size:144000
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3068416 size:144000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3068928 size:144000
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3681280 size:144000
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3681280 size:144000
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1384448 size:144000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1384960 size:144000
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st: 0 flags:0  ts: 2.160000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3681280 size:144000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3681280 size:144000
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3681280 size:144000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3681280 size:144000
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2456064 size:144000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2456576 size:144000
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3681280 size:144000
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3681280 size:144000
 ret: 0         st: 1 flags:1  ts: 0.200833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 772096 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 772608 size:144000
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3681280 size:144000
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3374592 size:144000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3375104 size:144000
 ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
 ret: 0         st: 1 flags:0  ts: 2.671667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3681280 size:144000
 ret: 0         st: 1 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680768 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3681280 size:144000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1843712 size:144000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1844224 size:144000
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:144000
index a2b477b..f6c26db 100644 (file)
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7134208 size:288000
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5945856 size:288000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5946368 size:288000
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7134208 size:288000
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7134208 size:288000
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2679296 size:288000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2679808 size:288000
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st: 0 flags:0  ts: 2.160000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7134208 size:288000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7134208 size:288000
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7134208 size:288000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7134208 size:288000
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4758016 size:288000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4758528 size:288000
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7134208 size:288000
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7134208 size:288000
 ret: 0         st: 1 flags:1  ts: 0.200833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:1491456 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:1491968 size:288000
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7134208 size:288000
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6539776 size:288000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6540288 size:288000
 ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
 ret: 0         st: 1 flags:0  ts: 2.671667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7134208 size:288000
 ret: 0         st: 1 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133696 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7134208 size:288000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3570176 size:288000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3570688 size:288000
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6656 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   7168 size:288000
index ca17ba7..11367cd 100644 (file)
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3773465 size:188416
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3773977 size:188416
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1700889 size:188416
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1701401 size:188416
 ret: 0         st: 0 flags:1  ts:-0.760000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3019801 size:188416
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3020313 size:188416
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 947225 size:188416
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 947737 size:188416
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4150297 size:188416
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4150809 size:188416
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
 ret: 0         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527641 size:188416
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2266137 size:188416
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2266649 size:188416
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:188416
index 12d4644..9bc0bfc 100644 (file)
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 0 flags:1 dts: 0.788333 pts: 0.788333 pos:  80825 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.788333 pts: 0.788333 pos:  81337 size:  3840
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos:  40185 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos:  40697 size:  3840
 ret: 0         st: 0 flags:1  ts:-0.740833
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st: 0 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st: 0 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624167 pts: 0.624167 pos:  65065 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.624167 pts: 0.624167 pos:  65577 size:  3840
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200833 pts: 0.200833 pos:  24425 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.200833 pts: 0.200833 pos:  24937 size:  3840
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st: 0 flags:1  ts: 1.989167
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  89945 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  90457 size:  3840
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840
 ret: 0         st: 0 flags:0  ts: 2.671667
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st: 0 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size:     2
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101655 size:     2
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  49305 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  49817 size:  3840
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:  3840
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5657 size:  3840