summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2019-08-24 01:39:33 +0200
committerMarton Balint <cus@passwd.hu>2019-08-31 17:38:25 +0200
commit2e31774b409d77f046f166fb3ff630a9ef91def7 (patch)
treeb95e7a602e68333b47e286ea883da1192f51067e /libavformat/riff.c
parent765c56bfa9037060e36250090880b2961c88f27d (diff)
avformat/avidec: add support for recognizing HEVC fourcc when demuxing
Some security cams generate this, as well as some versions of VirtualDub and VLC so support for _reading_ such files is justified. Fixes ticket #7110. See also this discussion: https://patchwork.ffmpeg.org/patch/8744/ Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 610974ebf0..f2c04f8d95 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -492,6 +492,11 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_NONE, 0 }
};
+const AVCodecTag ff_codec_bmp_tags_unofficial[] = {
+ { AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') },
+ { AV_CODEC_ID_NONE, 0 }
+};
+
const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_PCM_S16LE, 0x0001 },
/* must come after s16le in this list */