FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00

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

Remove some unused scripts from tools/.

2011-06-06 01:31:02 +02:00

cws2fws.c

tools: K&R reformatting cosmetics