Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jul 2012 21:56:02 +0000 (23:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jul 2012 21:57:11 +0000 (23:57 +0200)
commit9ca27df52fb4306a8e37c38d1ed9ab40c42a62dc
tree2da7168c9b3926d8a6886af3586fafeee41c5f4e
parent5f298c679107c3607f6f54c1f38eeb1ba36900a9
parent183b1c2268529bbb8389d572deb00083c49682dc
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>
17 files changed:
Changelog
configure
doc/general.texi
doc/protocols.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/tscc2.c
libavcodec/tscc2data.h
libavcodec/version.h
libavformat/riff.c
libavformat/rtsp.c
libavformat/rtsp.h
libavformat/rtspcodes.h
libavformat/rtspdec.c
libavformat/version.h
libavutil/libm.h