Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Jun 2012 20:34:02 +0000 (22:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Jun 2012 20:34:02 +0000 (22:34 +0200)
commite847f4128543432a77fb8f85c313646a406c76f6
treec23fd3d3cd7904fae57c6a3e7395e10e58ae5579
parent492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7
parent9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b
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>
20 files changed:
configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/libspeexenc.c
libavcodec/utvideo.c
libavcodec/x86/rv40dsp_init.c
libavformat/avformat.h
libavformat/avio.c
libavformat/hls.c
libavformat/hlsproto.c
libavformat/rtmphttp.c
libavutil/arm/float_dsp_init_arm.c
libavutil/arm/float_dsp_init_vfp.c
libavutil/avutil.h
libavutil/file.c
libavutil/log.c
libavutil/time.c
libavutil/time.h
tools/pktdumper.c