1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavutil
Michael Niedermayer 9ca27df52f 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>
2012-07-11 23:57:11 +02:00
..
2012-07-11 04:04:29 +02:00
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-01-22 23:06:04 +01:00
2012-07-04 15:45:05 +02:00
2012-07-04 15:45:05 +02:00
2012-05-15 18:08:32 +02:00
2012-05-15 18:08:32 +02:00
2012-06-06 20:01:08 +02:00
2012-06-09 02:51:02 +02:00
2012-07-07 01:41:55 +00:00
2012-07-05 08:21:49 +02:00
2012-06-07 22:13:59 +02:00
2012-07-06 17:08:22 +02:00
2012-07-04 23:23:09 +02:00