Merge remote-tracking branch 'qatar/master'

* qatar/master:
  binkvideo: simplify and remove invalid shifts
  pulse: compute frame_duration once and fix it
  lavf: simplify format_child_class_next()
  hwaccel: OS X Video Decoder Acceleration (VDA) support.
  doc: add support for an optional navigation bar in texi2html pages

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/vda.c
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/vda_internal.h
	libavcodec/version.h
	libavformat/options.c
	libavutil/avutil.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc Changelog
index 7dd82efabfb109881aee2a992725727b022a29ca,b9b5f26ae8d8c226c77218fdb14129266b202e2c..0b2d13bc7661f8395b262053ba1b042d45df6072
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -120,12 -101,35 +120,13 @@@ easier to use. The changes are
  - Encrypted OMA files support
  - Discworld II BMV decoding support
  - VBLE Decoder
+ - OS X Video Decoder Acceleration (VDA) support
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 +version 0.8:
  
  
 -version 0.7_beta2:
 -
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
 -
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support

diff --cc configure
index 891fd5564d407d181a65b32d215e67705afcd312,6e4259f9031527499e476a86f7bbfd0023b6ca82..8ff3f7f4e56a2d2fc44e7c1db978999f5f574eb4
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -109,10 -107,10 +109,11 @@@ Configuration options
    --disable-lpc            disable LPC code
    --disable-mdct           disable MDCT code
    --disable-rdft           disable RDFT code
 -  --enable-vaapi           enable VAAPI code
 -  --enable-vda             enable VDA code
 -  --enable-vdpau           enable VDPAU code
 +  --enable-vaapi           enable VAAPI code [autodetect]
++  --enable-vda             enable VDA code [autodetect]
 +  --enable-vdpau           enable VDPAU code [autodetect]
    --disable-dxva2          disable DXVA2 code
 +  --disable-vda            disable VDA code
    --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary)
    --enable-hardcoded-tables use hardcoded tables instead of runtime generation
    --enable-memalign-hack   emulate memalign, interferes with memory debuggers
@@@ -1494,8 -1392,8 +1495,9 @@@ zlib_encoder_select="zlib
  zmbv_decoder_select="zlib"
  zmbv_encoder_select="zlib"
  
 +crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
  vaapi_deps="va_va_h"
+ vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
  vdpau_deps="vdpau_vdpau_h vdpau_vdpau_x11_h"
  
  # parsers

diff --cc doc/t2h.init
index 015712f699e3228ac894fb6bb291de2b09dbca43,7c35cd8c53201169ca44638106193d512f209a7c..ee87ac2230aa6ccfd1cec508509b00f981e9d48f
--- 1/doc/t2h.init
--- 2/doc/t2h.init
+++ b/doc/t2h.init
@@@ -9,9 -9,13 +9,13 @@@ $EXTRA_HEAD 
  <link rel="stylesheet" type="text/css" href="default.css" />
  ';
  
 -my $LIBAV_NAVBAR = $ENV{"LIBAV_NAVBAR"} || '';
+ 
++my $FFMPEG_NAVBAR = $ENV{"FFMPEG_NAVBAR"} || '';
+ 
  $AFTER_BODY_OPEN =
- '<div id="container">
- <div id="body">';
+ '<div id="container">' .
 -"\n$LIBAV_NAVBAR\n" .
++"\n$FFMPEG_NAVBAR\n" .
+ '<div id="body">';
  
  $PRE_BODY_CLOSE = '</div></div>';
  

diff --cc libavcodec/bink.c
Simple merge

diff --cc libavcodec/version.h
index cd21d9504a45046cd152f6b7a93551eb05d116bb,356ecbb15c475526d7b405357256f61863938c02..b7f01e95c64b8bc3f0f021cd2c6c32c8f9be00af
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -21,7 -21,7 +21,7 @@@
  #define AVCODEC_VERSION_H
  
  #define LIBAVCODEC_VERSION_MAJOR 53
- #define LIBAVCODEC_VERSION_MINOR 33
 -#define LIBAVCODEC_VERSION_MINOR 20
++#define LIBAVCODEC_VERSION_MINOR 34
  #define LIBAVCODEC_VERSION_MICRO  0
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --cc libavdevice/pulse.c
Simple merge

diff --cc libavformat/options.c
Simple merge

diff --cc libavutil/avutil.h
index ac84cccad2b2d4a3a69976ed4844fbdd9168bf2c,4b226e0fb97dc62c953dff48e3021ff9f4a1333e..72cfb8a3c0913871efcbe08c0bb82882f5fe3438
--- 1/libavutil/avutil.h
--- 2/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@@ -40,8 -40,8 +40,8 @@@
  #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
  
  #define LIBAVUTIL_VERSION_MAJOR 51
- #define LIBAVUTIL_VERSION_MINOR 24
- #define LIBAVUTIL_VERSION_MICRO  1
 -#define LIBAVUTIL_VERSION_MINOR 15
++#define LIBAVUTIL_VERSION_MINOR 25
+ #define LIBAVUTIL_VERSION_MICRO  0
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \

diff --cc libavutil/pixdesc.c
Simple merge

diff --cc libavutil/pixfmt.h
index 6719e83489e1689a74de88bd51632afe5b8aeb88,1861fdfb9af8ba8fab8147a1edf2442137551137..37b694e7bf45d2f503632fd08584b0f734543aa7
--- 1/libavutil/pixfmt.h
--- 2/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@@ -151,15 -147,7 +151,14 @@@ enum PixelFormat 
      PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
      PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
      PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-     PIX_FMT_VDA_VLD,   ///< HW decoding through VDA.
- 
+     PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
 +
 +    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
 +    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
 +    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
 +    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
 +    PIX_FMT_GBR24P,    ///< planar GBR, 24bpp, 8G, 8B, 8R.
 +
      PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
  };