diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-02-14 23:21:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-02-14 23:21:17 +0000 |
| commit | dcadd216f116b6a4b83d41c0cfe36b3986daae15 (patch) | |
| tree | 81bb8e6b0f7ee568b471df1b72893f43d755743e /libavformat/mov.c | |
| parent | 8b031359589dbe4ad207f014325c3341b795b625 (diff) | |
| download | ffmpeg-dcadd216f116b6a4b83d41c0cfe36b3986daae15.tar.gz | |
mov fourccs for handling FCP files by (Baptiste COUDURIER )(baptiste.coudurier smartjog com)
Originally committed as revision 5023 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e0a7b785fc..c15fd9a47f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -144,10 +144,18 @@ static const CodecTag mov_video_tags[] = { { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */ { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 produced by Sony HD camera */ + { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX 635/50 50mb/s produced by FCP */ + { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX 635/50 30mb/s produced by FCP */ + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */ + //{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD produced by FCP */ + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 produced by FCP */ + { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* HDV produced by FCP */ + //{ CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */ { CODEC_ID_NONE, 0 }, }; static const CodecTag mov_audio_tags[] = { + { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') }, /* { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */ { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */ /* { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') },*/ /* 8 bits */ |