Merge commit '6c99c92a'

* commit '6c99c92a':
  libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag

Conflicts:
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/APIchanges

@@ -15,6 +15,9 @@ libavutil:     2014-08-09
 
 API changes, most recent first:
 
+201x-xx-xx - xxxxxxx - lavc 56.9.0 - avcodec.h
+  Add AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH flag to av_vdpau_bind_context().
+
 201x-xx-xx - xxxxxxx - lavc 56.8.0 - avcodec.h
   Add AVCodecContext.sw_pix_fmt.
 

libavcodec/avcodec.h

@@ -3403,6 +3403,12 @@ typedef struct AVHWAccel {
  */
 #define AV_HWACCEL_FLAG_IGNORE_LEVEL (1 << 0)
 
+/**
+ * Hardware acceleration can output YUV pixel formats with a different chroma
+ * sampling than 4:2:0 and/or other than 8 bits per component.
+ */
+#define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1)
+
 /**
  * @}
  */

libavcodec/version.h

@@ -29,7 +29,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR  17
+#define LIBAVCODEC_VERSION_MINOR  18
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \