From 5ac4d7689d753147f89b3322593d6998e32d27c4 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 8 Feb 2009 05:12:30 +0000 Subject: reuse MXFCodecUL for data def and simplify Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mxf.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libavformat/mxf.c') diff --git a/libavformat/mxf.c b/libavformat/mxf.c index cd84cb5264..05cb173ac3 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -24,11 +24,10 @@ /** * SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */ -const MXFDataDefinitionUL ff_mxf_data_definition_uls[] = { - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }, CODEC_TYPE_VIDEO }, - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 }, CODEC_TYPE_AUDIO }, - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x05,0x01,0x03,0x02,0x02,0x02,0x02,0x00,0x00 }, CODEC_TYPE_AUDIO }, - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, CODEC_TYPE_DATA }, +const MXFCodecUL ff_mxf_data_definition_uls[] = { + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }, 13, CODEC_TYPE_VIDEO }, + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 }, 13, CODEC_TYPE_AUDIO }, + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_TYPE_DATA }, }; const MXFCodecUL ff_mxf_codec_uls[] = { -- cgit v1.2.3