diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-08-31 01:39:42 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-08-31 01:39:42 +0000 |
| commit | 4ee873e39d2eff5798b1a5d0fc5665259262fdd4 (patch) | |
| tree | 89dd40a3597591c124286ca68b92d282c1f719e3 /libavformat/mxf.c | |
| parent | ecb71f8fe885bfa7a142df81b5bf1d94fd7ccb31 (diff) | |
put back mxf_essence_container_uls in demuxer as static const
Originally committed as revision 15083 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxf.c')
| -rw-r--r-- | libavformat/mxf.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 6f2b61a263..5fc0bfc2b0 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -51,15 +51,3 @@ const MXFCodecUL ff_mxf_codec_uls[] = { //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 }, 15, CODEC_ID_DOLBY_E }, /* Dolby-E */ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, }; - -const MXFCodecUL ff_mxf_essence_container_uls[] = { - // video essence container uls - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, CODEC_ID_DVVIDEO }, /* DV 625 25mbps */ - // sound essence container uls - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x06,0x01,0x00 }, 14, CODEC_ID_PCM_S16LE }, /* BWF Frame wrapped */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x40,0x01 }, 14, CODEC_ID_MP2 }, /* MPEG-ES Frame wrapped, 0x40 ??? stream id */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, 14, CODEC_ID_PCM_S16LE }, /* D-10 Mapping 50Mbps PAL Extended Template */ - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, -}; - |