diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:17:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 23:23:01 +0100 |
| commit | e1f37c48e54f98d34f8a032e1d96f7a135a8545d (patch) | |
| tree | 74c11781b08a32228c081d6e679d778b6ac686a5 /libavformat/riff.c | |
| parent | fa4bb7c5b249da60cd16113b795a64f0055ef164 (diff) | |
| parent | 247e370e2a913db52ca079b347a174c8d393b171 (diff) | |
| download | ffmpeg-e1f37c48e54f98d34f8a032e1d96f7a135a8545d.tar.gz | |
Merge commit '247e370e2a913db52ca079b347a174c8d393b171'
* commit '247e370e2a913db52ca079b347a174c8d393b171':
TDSC decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -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 696b06bc1a..05b9acf40d 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -363,6 +363,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '5') }, { AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') }, { AV_CODEC_ID_HQX, MKTAG('C', 'H', 'Q', 'X') }, + { AV_CODEC_ID_TDSC, MKTAG('T', 'D', 'S', 'C') }, { AV_CODEC_ID_NONE, 0 } }; |