diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:52:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 12:52:59 +0100 |
| commit | ddb9a24a7f11c448263ef9b163e8425832cb089c (patch) | |
| tree | c5b30aba2e7ad4170b4e885b646ba0a1908eaf66 | |
| parent | d16079abf473b51be7686d20f8014bb48a095722 (diff) | |
| parent | 6c99c92a42add7f6a462114d5a4a53c93c551058 (diff) | |
Merge commit '6c99c92a42add7f6a462114d5a4a53c93c551058'
* commit '6c99c92a42add7f6a462114d5a4a53c93c551058':
libavcodec: add AV_HWACCEL_ALLOW_HIGH_DEPTH flag
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index caa05d13b8..5135464729 100644 --- a/doc/APIchanges +++ b/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. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 527824601e..99467bb069 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3404,6 +3404,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) + +/** * @} */ diff --git a/libavcodec/version.h b/libavcodec/version.h index d85a2542c7..7e33da02d9 100644 --- a/libavcodec/version.h +++ b/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, \ |