Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'

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

Conflicts:
	libavcodec/version.h

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

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)
+
 /**
  * @}
  */