changeset 4536:b94bedbb59d7 libavformat

always use multi track since timecode track is present
author bcoudurier
date Wed, 18 Feb 2009 07:13:57 +0000
parents be04cfe425ed
children 6e217e9ca23d
files mxfenc.c
diffstat 1 files changed, 3 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/mxfenc.c	Wed Feb 18 04:57:54 2009 +0000
+++ b/mxfenc.c	Wed Feb 18 07:13:57 2009 +0000
@@ -195,7 +195,7 @@
 /**
  * complete key for operation pattern, partitions, and primer pack
  */
-static const uint8_t op1a_ul[]                     = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x01,0x01,0x00 };
+static const uint8_t op1a_ul[]                     = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x01,0x09,0x00 };
 static const uint8_t footer_partition_key[]        = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x04,0x04,0x00 }; // ClosedComplete
 static const uint8_t primer_pack_key[]             = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x05,0x01,0x00 };
 static const uint8_t index_table_segment_key[]     = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x10,0x01,0x00 };
@@ -465,12 +465,7 @@
 
     // operational pattern
     mxf_write_local_tag(pb, 16, 0x3B09);
-    if (s->nb_streams > 1) {
-        put_buffer(pb, op1a_ul, 14);
-        put_be16(pb, 0x0900); // multi track
-    } else {
-        put_buffer(pb, op1a_ul, 16);
-    }
+    put_buffer(pb, op1a_ul, 16);
 
     // write essence_container_refs
     mxf_write_local_tag(pb, 8 + 16 * mxf->essence_container_count, 0x3B0A);
@@ -1234,12 +1229,7 @@
     put_be32(pb, bodysid); // bodySID
 
     // operational pattern
-    if (s->nb_streams > 1) {
-        put_buffer(pb, op1a_ul, 14);
-        put_be16(pb, 0x0900); // multi track
-    } else {
-        put_buffer(pb, op1a_ul, 16);
-    }
+    put_buffer(pb, op1a_ul, 16);
 
     // essence container
     mxf_write_essence_container_refs(s);