[SCM] libav/experimental: riff: Add V264 for H264 in CCTV recordings

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9d9d319a3c29af40e233237391b380e5d0754691
Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date:   Sun Dec 2 00:43:39 2012 +0100

    riff: Add V264 for H264 in CCTV recordings

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 4703176..20be960 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -36,6 +36,7 @@ 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_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