diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-11 23:56:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-11 23:57:11 +0200 |
| commit | 9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc (patch) | |
| tree | 2da7168c9b3926d8a6886af3586fafeee41c5f4e /libavformat/riff.c | |
| parent | 5f298c679107c3607f6f54c1f38eeb1ba36900a9 (diff) | |
| parent | 183b1c2268529bbb8389d572deb00083c49682dc (diff) | |
| download | ffmpeg-9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Check for the math function rint
TechSmith Screen Codec 2 decoder
rtsp: Add listen mode
rtsp: Make rtsp_open_transport_ctx() non-static
rtsp: Move rtsp_read_close
rtsp: Parse the mode=receive/record parameter in transport lines
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
libavformat/version.h
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 fe8b49fc28..f6b2177796 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -310,6 +310,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, { CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') }, { CODEC_ID_MSA1, MKTAG('M', 'S', 'A', '1') }, + { CODEC_ID_TSCC2, MKTAG('T', 'S', 'C', '2') }, { CODEC_ID_NONE, 0 } }; |