diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 14:22:40 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-24 14:22:40 +0000 |
| commit | acf36dba185f6dd72709ba8984fe79ac3cd250bb (patch) | |
| tree | 9ef6a34868a64ec5a96fd8ee43a964f0dbb56bb7 /libavformat/mxf.c | |
| parent | 30a3e5d490acd7351f6f519c46f9181a99563ca0 (diff) | |
| download | ffmpeg-acf36dba185f6dd72709ba8984fe79ac3cd250bb.tar.gz | |
correct uid, and enable JPEG 2000 detection
Originally committed as revision 6078 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxf.c')
| -rw-r--r-- | libavformat/mxf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 33eed09019..46c8f50fa7 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -630,7 +630,7 @@ static const MXFCodecUL mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x04,0x00 }, CODEC_ID_DVVIDEO, Frame }, /* DVCPRO50 PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x02,0x02,0x00 }, CODEC_ID_DVVIDEO, Frame }, /* DVCPRO25 PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, CODEC_ID_DVVIDEO, Frame }, /* DV25 IEC PAL */ - //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_JPEG2K, Frame }, /* JPEG2000 Codestream */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, CODEC_ID_JPEG2000, Frame }, /* JPEG2000 Codestream */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, CODEC_ID_RAWVIDEO, Frame }, /* Uncompressed */ /* SoundEssenceCompression */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, CODEC_ID_PCM_S16LE, Frame }, /* Uncompressed */ |