[SCM] libav/experimental: riff: Support XMPG as mpeg1

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9ff6429b0742723560198963ef97e2b8c111b0a3
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Apr 3 15:31:46 2014 +0200

    riff: Support XMPG as mpeg1

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7a5f1f4..7396fc3 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -163,6 +163,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_MPEG2VIDEO,   MKTAG('M', '7', '0', '1') },
     { AV_CODEC_ID_MPEG2VIDEO,   MKTAG('m', 'p', 'g', 'v') },
     { AV_CODEC_ID_MPEG1VIDEO,   MKTAG('B', 'W', '1', '0') },
+    { AV_CODEC_ID_MPEG1VIDEO,   MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */
     { AV_CODEC_ID_MJPEG,        MKTAG('M', 'J', 'P', 'G') },
     { AV_CODEC_ID_MJPEG,        MKTAG('L', 'J', 'P', 'G') },
     { AV_CODEC_ID_MJPEG,        MKTAG('d', 'm', 'b', '1') },

-- 
Libav/FFmpeg packaging