diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-09-29 21:34:31 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-09-29 21:34:31 +0000 |
| commit | 3432c26319de1508d6371c427ce19f76863eefa0 (patch) | |
| tree | 46dea5799ef8ea19a7f92c48727f0530f2f1a94a /libavformat/isom.c | |
| parent | a52ffc3f54e6ba9417513edf9a75c66dfcb93ebb (diff) | |
Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx
Originally committed as revision 25263 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 9064576834..a568c4d76c 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -130,8 +130,10 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */ + { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */ { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '2') }, /* Apple MPEG-2 Camcorder */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */ { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */ |