summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-07-29 14:00:47 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2006-07-29 14:00:47 +0000
commit8ce2215b238dc0faed4e9ce26ef45be88d7902bb (patch)
treef794e961498ef67a661bb53b0d70048118d46134 /libavformat
parent54a3360b20066b0b1790b0d9d3a877e70526802f (diff)
parse rgba descriptor (jpeg2000, uncompressed)
Originally committed as revision 5852 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mxf.c3
1 files changed, 3 insertions, 0 deletions
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))