[SCM] libav/experimental: riff: add G264 to mpeg4, only decodes keyframes

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fa6a021121326777e70176047faa0d8de2ea48ac
Author: Compn <tempn at twmi.rr.com>
Date:   Fri Nov 15 09:45:08 2013 -0500

    riff: add G264 to mpeg4, only decodes keyframes

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 7c5790b..bb2b82d 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -83,6 +83,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_MPEG4,        MKTAG('M', '4', 'T', '3') },
     { AV_CODEC_ID_MPEG4,        MKTAG('G', 'E', 'O', 'X') },
     /* flipped video */
+    { AV_CODEC_ID_MPEG4,        MKTAG('G', '2', '6', '4') },
+    /* flipped video */
     { AV_CODEC_ID_MPEG4,        MKTAG('H', 'D', 'X', '4') },
     { AV_CODEC_ID_MPEG4,        MKTAG('D', 'M', 'K', '2') },
     { AV_CODEC_ID_MPEG4,        MKTAG('D', 'I', 'G', 'I') },

-- 
Libav/FFmpeg packaging