From 8ce2215b238dc0faed4e9ce26ef45be88d7902bb Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sat, 29 Jul 2006 14:00:47 +0000 Subject: [PATCH] parse rgba descriptor (jpeg2000, uncompressed) Originally committed as revision 5852 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mxf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 8b744fbeaa..14580b2e8f 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -152,6 +152,7 @@ static const UID mxf_metadata_source_clip_key = { 0x06,0x0e,0x2b,0x static const UID mxf_metadata_multiple_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x44,0x00 }; static const UID mxf_metadata_generic_sound_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x42,0x00 }; static const UID mxf_metadata_cdci_descriptor_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x28,0x00 }; +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_static_track_key = { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3A,0x00 }; @@ -841,6 +842,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_cdci_descriptor_key)) ret = mxf_read_metadata_generic_descriptor(mxf, &klv); + else if (IS_KLV_KEY(klv.key, mxf_metadata_rgba_descriptor_key)) + 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_preface_key))