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>

diff --cc configure
index 995161a,aa1856d..f498357
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1239,11 -1113,10 +1239,12 @@@ HAVE_LIST=
      memalign
      mkstemp
      mmap
+     nanosleep
      netinet_sctp_h
 +    PeekNamedPipe
      poll_h
      posix_memalign
 +    pthread_cancel
      round
      roundf
      sched_getaffinity
@@@ -3159,32 -2854,30 +3164,36 @@@ check_func  strptim
  check_func  sched_getaffinity
  check_func  sysconf
  check_func  sysctl
+ check_func  usleep
 +check_func_headers conio.h kbhit
 +check_func_headers windows.h PeekNamedPipe
  check_func_headers io.h setmode
 +check_func_headers lzo/lzo1x.h lzo1x_999_compress
  check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
  check_func_headers windows.h GetProcessAffinityMask
  check_func_headers windows.h GetProcessTimes
  check_func_headers windows.h GetSystemTimeAsFileTime
  check_func_headers windows.h MapViewOfFile
+ check_func_headers windows.h Sleep
  check_func_headers windows.h VirtualAlloc
 +check_func_headers glob.h glob
  
  check_header dlfcn.h
 -check_header dxva2api.h
 +check_header dxva2api.h -D_WIN32_WINNT=0x0600
 +check_header libcrystalhd/libcrystalhd_if.h
  check_header malloc.h
  check_header poll.h
  check_header sys/mman.h
  check_header sys/param.h
  check_header sys/resource.h
  check_header sys/select.h
 +check_header termios.h
+ check_header unistd.h
  check_header vdpau/vdpau.h
  check_header vdpau/vdpau_x11.h
+ check_header windows.h
  check_header X11/extensions/XvMClib.h
 +check_header asm/types.h
  
  disabled  zlib || check_lib   zlib.h      zlibVersion -lz   || disable  zlib
  disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib

diff --cc doc/APIchanges
index b36138e,b84c7ae..0b5ccc9
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,29 -13,9 +15,32 @@@ libavutil:     2011-04-1
  
  API changes, most recent first:
  
 +2012-04-11 - xxxxxxx - lavu 51.58.100 - error.h
 +  Add av_make_error_string() and av_err2str() utilities to
 +  libavutil/error.h.
 +
 +2012-06-05 - xxxxxxx - lavc 54.24.100
 +  Add pkt_duration field to AVFrame.
 +
 +2012-05-24 - xxxxxxx - lavu 51.54.100
 +  Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from
 +  libavcodec/avcodec.h to libavutil/pixfmt.h.
 +
 +2012-05-07 - xxxxxxx - lavf 54.5.100
 +  Add av_guess_sample_aspect_ratio() function.
 +
 +2012-04-20 - xxxxxxx - lavfi 2.70.100
 +  Add avfilter_unref_bufferp() to avfilter.h.
 +
 +2012-04-12 - xxxxxxx - lavfi 2.68.100
 +  Install libavfilter/asrc_abuffer.h public header.
 +
 +2012-03-26 - a67d9cf - lavfi 2.66.100
 +  Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
 +
+ 2012-06-22 - xxxxxxx - lavu 51.34.0
+   Add av_usleep()
+ 
  2012-06-20 - ae0a301 - lavu 51.33.0
    Move av_gettime() to libavutil, add libavutil/time.h
  

diff --cc ffmpeg.c
index 80f4fe4,bc6a8fb..d7a44a8
--- 1/ffmpeg.c
--- 2/avconv.c
+++ b/ffmpeg.c
@@@ -31,7 -27,6 +31,9 @@@
  #include <errno.h>
  #include <signal.h>
  #include <limits.h>
++#if HAVE_ISATTY
 +#include <unistd.h>
++#endif
  #include "libavformat/avformat.h"
  #include "libavdevice/avdevice.h"
  #include "libswscale/swscale.h"
@@@ -49,13 -44,9 +51,14 @@@
  #include "libavutil/avstring.h"
  #include "libavutil/libm.h"
  #include "libavutil/imgutils.h"
 +#include "libavutil/timestamp.h"
 +#include "libavutil/bprint.h"
+ #include "libavutil/time.h"
  #include "libavformat/os_support.h"
  
 +#include "libavformat/ffm.h" // not public API
 +
 +# include "libavfilter/avcodec.h"
  # include "libavfilter/avfilter.h"
  # include "libavfilter/avfiltergraph.h"
  # include "libavfilter/buffersrc.h"
@@@ -2300,10 -1873,10 +2303,10 @@@ static void do_streamcopy(InputStream *
  static void rate_emu_sleep(InputStream *ist)
  {
      if (input_files[ist->file_index]->rate_emu) {
 -        int64_t pts = av_rescale(ist->last_dts, 1000000, AV_TIME_BASE);
 +        int64_t pts = av_rescale(ist->dts, 1000000, AV_TIME_BASE);
          int64_t now = av_gettime() - ist->start;
          if (pts > now)
-             usleep(pts - now);
+             av_usleep(pts - now);
      }
  }
  

diff --cc ffplay.c
index 55c7825,6acb6c1..753ff91
--- 1/ffplay.c
--- 2/avplay.c
+++ b/ffplay.c
@@@ -36,7 -31,7 +36,8 @@@
  #include "libavutil/dict.h"
  #include "libavutil/parseutils.h"
  #include "libavutil/samplefmt.h"
 +#include "libavutil/avassert.h"
+ #include "libavutil/time.h"
  #include "libavformat/avformat.h"
  #include "libavdevice/avdevice.h"
  #include "libswscale/swscale.h"
@@@ -55,12 -49,15 +56,11 @@@
  #include <SDL.h>
  #include <SDL_thread.h>
  
 -#ifdef __MINGW32__
 -#undef main /* We don't want SDL to override our main() */
 -#endif
 +#include "cmdutils.h"
  
- #include <unistd.h>
  #include <assert.h>
  
 -const char program_name[] = "avplay";
 +const char program_name[] = "ffplay";
  const int program_birth_year = 2003;
  
  #define MAX_QUEUE_SIZE (15 * 1024 * 1024)
@@@ -1014,8 -952,7 +1014,8 @@@ static int refresh_thread(void *opaque
              is->refresh = 1;
              SDL_PushEvent(&event);
          }
 -        av_usleep(is->audio_st && is->show_audio ? rdftspeed * 1000 : 5000); // FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
 +        //FIXME ideally we should wait the correct time but SDLs event passing is so slow it would be silly
-         usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
++        av_usleep(is->audio_st && is->show_mode != SHOW_MODE_VIDEO ? rdftspeed*1000 : 5000);
      }
      return 0;
  }

diff --cc libavcodec/libspeexenc.c
Simple merge

diff --cc libavcodec/utvideo.c
Simple merge

diff --cc libavcodec/x86/rv40dsp_init.c
Simple merge

diff --cc libavformat/avformat.h
Simple merge

diff --cc libavformat/avio.c
Simple merge

diff --cc libavformat/hls.c
Simple merge

diff --cc libavformat/hlsproto.c
Simple merge

diff --cc libavformat/rtmphttp.c
Simple merge

diff --cc libavutil/arm/float_dsp_init_arm.c
Simple merge

diff --cc libavutil/arm/float_dsp_init_vfp.c
Simple merge

diff --cc libavutil/avutil.h
index b3f213a,351e827..0efaa95
--- 1/libavutil/avutil.h
--- 2/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@@ -153,8 -152,8 +153,8 @@@
   */
  
  #define LIBAVUTIL_VERSION_MAJOR 51
- #define LIBAVUTIL_VERSION_MINOR 60
 -#define LIBAVUTIL_VERSION_MINOR 34
 -#define LIBAVUTIL_VERSION_MICRO  0
++#define LIBAVUTIL_VERSION_MINOR 61
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \

diff --cc libavutil/file.c
Simple merge

diff --cc libavutil/log.c
index f2272fb,e4a9fec..4464bd3
--- 1/libavutil/log.c
--- 2/libavutil/log.c
+++ b/libavutil/log.c
@@@ -24,8 -24,13 +24,12 @@@
   * logging functions
   */
  
+ #include "config.h"
+ 
+ #if HAVE_ISATTY
  #include <unistd.h>
+ #endif
  #include <stdlib.h>
 -#include "avstring.h"
  #include "avutil.h"
  #include "log.h"
  

diff --cc libavutil/time.c
Simple merge

diff --cc libavutil/time.h
Simple merge

diff --cc tools/pktdumper.c
Simple merge