[SCM] libav/experimental: Use new apple fourcc for mpeg-1 and mpeg-2 in mov, works natively on osx

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3432c26319de1508d6371c427ce19f76863eefa0
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed Sep 29 21:34:31 2010 +0000

    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

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 9064576..a568c4d 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 */

-- 
Libav/FFmpeg packaging