[SCM] libav/experimental: parse aes3 audio descriptor

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 53512a22cb7957bc59b1cda6d8b8a9c3e264f0b2
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Jul 31 09:46:05 2006 +0000

    parse aes3 audio descriptor
    
    Originally committed as revision 5870 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 938a698..e6c6ea2 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -155,6 +155,7 @@ static const UID mxf_metadata_cdci_descriptor_key          = { 0x06,0x0e,0x2b,0x
 static const UID mxf_metadata_rgba_descriptor_key          = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x29,0x00 };
 static const UID mxf_metadata_mpegvideo_descriptor_key     = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 };
 static const UID mxf_metadata_wave_descriptor_key          = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x48,0x00 };
+static const UID mxf_metadata_aes3_descriptor_key          = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x47,0x00 };
 static const UID mxf_metadata_static_track_key             = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3A,0x00 };
 static const UID mxf_metadata_track_key                    = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3b,0x00 };
 
@@ -876,6 +877,8 @@ static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             ret = mxf_read_metadata_generic_descriptor(mxf, &klv);
         else if (IS_KLV_KEY(klv.key, mxf_metadata_generic_sound_descriptor_key))
             ret = mxf_read_metadata_generic_descriptor(mxf, &klv);
+        else if (IS_KLV_KEY(klv.key, mxf_metadata_aes3_descriptor_key))
+            ret = mxf_read_metadata_generic_descriptor(mxf, &klv);
         else if (IS_KLV_KEY(klv.key, mxf_metadata_preface_key))
             ret = mxf_read_metadata_preface(mxf, &klv);
         else if (IS_KLV_KEY(klv.key, mxf_metadata_content_storage_key))

-- 
Libav/FFmpeg packaging