[SCM] libav/experimental: riff: add FourCC for GeoVision cameras

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit dcb6e145ebb3a13e8f575703aa38eb5cf2be9c5d
Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date:   Thu Apr 3 12:46:46 2014 +0200

    riff: add FourCC for GeoVision cameras

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 20be960..4e09451 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -36,7 +36,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_H264,         MKTAG('S', 'M', 'V', '2') },
     { AV_CODEC_ID_H264,         MKTAG('V', 'S', 'S', 'H') },
     { AV_CODEC_ID_H264,         MKTAG('Q', '2', '6', '4') }, /* QNAP surveillance system */
-    { AV_CODEC_ID_H264,         MKTAG('V', '2', '6', '4') },
+    { AV_CODEC_ID_H264,         MKTAG('V', '2', '6', '4') }, /* CCTV recordings */
+    { AV_CODEC_ID_H264,         MKTAG('G', 'A', 'V', 'C') }, /* GeoVision camera */
     { AV_CODEC_ID_H263,         MKTAG('H', '2', '6', '3') },
     { AV_CODEC_ID_H263,         MKTAG('X', '2', '6', '3') },
     { AV_CODEC_ID_H263,         MKTAG('T', '2', '6', '3') },

-- 
Libav/FFmpeg packaging