virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
98b3f17bd7
FFmpeg/tools
History
Michael Niedermayer e847f41285 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libspeexenc: add supported sample rates and channel layouts.
  Replace usleep() calls with av_usleep()
  lavu: add av_usleep() function
  utvideo: mark interlaced frames as such
  utvideo: Fix interlaced prediction for RGB utvideo.
  cosmetics: do not use full path for local headers
  lavu/file: include unistd.h only when available
  configure: check for unistd.h
  log: include unistd.h only when needed
  lavf: include libavutil/time.h instead of redeclaring av_gettime()

Conflicts:
	configure
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/utvideo.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-22 22:34:02 +02:00
..
aviocat.c Replace usleep() calls with av_usleep() 2012-06-22 17:15:36 +01:00
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
clean-diff
cws2fws.c tools: K&R reformatting cosmetics 2012-01-25 15:31:11 +01:00
enum_options.c
ffeval.c tools: add ffeval tool 2012-01-17 12:10:07 +01:00
graph2dot.c tools/graph2dot: factorize code printing non-media specific link information 2012-06-06 23:20:02 +02:00
ismindex.c tests and tools: cleanup ffmpeg reference 2012-05-27 15:42:55 +02:00
lavfi-showfiltfmts.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
patcheck Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
probetest.c probetest: allow specifying parameters on the command line 2012-05-31 15:53:58 +02:00
qt-faststart.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
trasher.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
unwrap-diff