Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

* commit '02d76141d68e38c80f9a205a56b9af10d74f0995': riff: Add 'tshd' FourCC for H.264 Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 59f687b73c
parent 182499be72 02d76141d6
commit 59f687b73c
1 changed files with 1 additions and 0 deletions
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@ -42,6 +42,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
    { 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_H264,         MKTAG('U', 'M', 'S', 'V') },
+    { AV_CODEC_ID_H264,         MKTAG('t', 's', 'h', 'd') },
    { AV_CODEC_ID_H264,         MKTAG('I', 'N', 'M', 'C') },
    { AV_CODEC_ID_H263,         MKTAG('H', '2', '6', '3') },
    { AV_CODEC_ID_H263,         MKTAG('X', '2', '6', '3') },