diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:48:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 20:48:39 +0100 |
| commit | 59f687b73ceb40e53314c5c1607669e97fcd9d13 (patch) | |
| tree | d6926c4183116e3ac3bbb7cf17556fad0dd702fa /libavformat | |
| parent | 182499be721e568255185a4541d72b5ac78408a2 (diff) | |
| parent | 02d76141d68e38c80f9a205a56b9af10d74f0995 (diff) | |
| download | ffmpeg-59f687b73ceb40e53314c5c1607669e97fcd9d13.tar.gz | |
Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'
* commit '02d76141d68e38c80f9a205a56b9af10d74f0995':
riff: Add 'tshd' FourCC for H.264
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 05b9acf40d..eb58ecc91e 100644 --- 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') }, |