diff --git a/Changelog b/Changelog index 0ecda9ed52..996ed2ca51 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ version : - AVS3 demuxer - AVS3 video decoder via libuavs3d - Cintel RAW decoder +- VDPAU accelerated VP9 10/12bit decoding version 4.3: diff --git a/libavcodec/version.h b/libavcodec/version.h index 935a46940d..c80fc4df86 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 110 +#define LIBAVCODEC_VERSION_MINOR 111 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index fd0bab14a2..8b89fd68e2 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -223,6 +223,9 @@ static int update_size(AVCodecContext *avctx, int w, int h) #endif #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; +#endif +#if CONFIG_VP9_VDPAU_HWACCEL + *fmtp++ = AV_PIX_FMT_VDPAU; #endif break; case AV_PIX_FMT_YUV420P12: @@ -231,6 +234,9 @@ static int update_size(AVCodecContext *avctx, int w, int h) #endif #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; +#endif +#if CONFIG_VP9_VDPAU_HWACCEL + *fmtp++ = AV_PIX_FMT_VDPAU; #endif break; }