[FFmpeg-cvslog] r25263 - trunk/libavformat/isom.c

[bcoudurier]

Author: bcoudurier
Date: Wed Sep 29 23:34:31 2010
New Revision: 25263

Log:
Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx

Modified:
   trunk/libavformat/isom.c

Modified: trunk/libavformat/isom.c
==============================================================================
--- trunk/libavformat/isom.c	Wed Sep 29 19:42:26 2010	(r25262)
+++ trunk/libavformat/isom.c	Wed Sep 29 23:34:31 2010	(r25263)
@@ -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 */