[SCM] libav/experimental: isom: add 'm1v ' tag

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5a85cf0fc224a00c8e0401b7314ecc985362986f
Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date:   Thu Apr 3 09:55:32 2014 +0200

    isom: add 'm1v ' tag
    
    Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 9bf8db4..5a48b7b 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -161,6 +161,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
     { AV_CODEC_ID_H264, MKTAG('A', 'V', 'i', 'n') }, /* AVC-Intra with implicit SPS/PPS */
     { AV_CODEC_ID_H264, MKTAG('a', 'i', 'v', 'x') }, /* XAVC 4:2:2 10bit */
 
+    { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') },
     { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
     { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
     { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */

-- 
Libav/FFmpeg packaging