virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-04-29 12:54:10 +02:00
Code Issues Releases Activity
51,923 Commits 39 Branches 417 Tags
ff99b42e045a0b40bf81e4e38e6ef86f4db32006
Commit Graph

2 Commits

Author SHA1 Message Date
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
Kostya Shishkov 781888da89 TechSmith Screen Codec 2 decoder 2012-07-11 07:29:05 +02:00