aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2014-04-03 12:46:46 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-04-04 01:29:22 +0200
commitdcb6e145ebb3a13e8f575703aa38eb5cf2be9c5d (patch)
tree26d8ce7bbaeb6a2e28adb0e3b450330a97543bcf
parent9d9d319a3c29af40e233237391b380e5d0754691 (diff)
downloadffmpeg-dcb6e145ebb3a13e8f575703aa38eb5cf2be9c5d.tar.gz
riff: add FourCC for GeoVision cameras
-rw-r--r--libavformat/riff.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 20be960918..4e09451aeb 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') },