[SCM] libav/experimental: thanks to interleaving, audio is now locked

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:36:31 UTC 2013


The following commit has been merged in the experimental branch:
commit 3f2795ed5405cadf4c542bddf237d9dfb50890ed
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sat Jan 31 06:54:30 2009 +0000

    thanks to interleaving, audio is now locked
    
    Originally committed as revision 16893 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index cf3472d..e626435 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -173,6 +173,7 @@ static const MXFLocalTagPair mxf_local_tag_batch[] = {
     { 0x320E, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x00,0x00,0x00}}, /* Aspect Ratio */
     { 0x3201, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x02,0x04,0x01,0x06,0x01,0x00,0x00,0x00,0x00}}, /* Picture Essence Coding */
     // Generic Sound Essence Descriptor
+    { 0x3D02, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x01,0x04,0x00,0x00,0x00}}, /* Locked/Unlocked */
     { 0x3D03, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x03,0x01,0x01,0x01,0x00,0x00}}, /* Audio sampling rate */
     { 0x3D07, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x05,0x04,0x02,0x01,0x01,0x04,0x00,0x00,0x00}}, /* ChannelCount */
     { 0x3D01, {0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x04,0x04,0x02,0x03,0x03,0x04,0x00,0x00,0x00}}, /* Quantization bits */
@@ -607,7 +608,10 @@ static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st)
 {
     ByteIOContext *pb = s->pb;
 
-    mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key, 88);
+    mxf_write_generic_desc(pb, st, mxf_wav_descriptor_key, 93);
+
+    mxf_write_local_tag(pb, 1, 0x3D02);
+    put_byte(pb, 1);
 
     // write audio sampling rate
     mxf_write_local_tag(pb, 8, 0x3D03);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list