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 /libavcodec/allcodecs.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 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ef75b08f42..c718ffb566 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -222,6 +222,7 @@ void avcodec_register_all(void) REGISTER_DECODER (TRUEMOTION1, truemotion1); REGISTER_DECODER (TRUEMOTION2, truemotion2); REGISTER_DECODER (TSCC, tscc); + REGISTER_DECODER (TSCC2, tscc2); REGISTER_DECODER (TXD, txd); REGISTER_DECODER (ULTI, ulti); REGISTER_DECODER (UTVIDEO, utvideo); |