diff options
| author | Mark Thompson <sw@jkqxz.net> | 2016-08-24 23:30:29 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-01-17 23:06:46 +0000 |
| commit | 2a4a8653b6ca77ed1c9cec1336c55d291ef545b6 (patch) | |
| tree | 3841d6d6be3756b943b6ec8802aa2ba2c2b75bcb /libavcodec/vaapi_decode.h | |
| parent | 542a65d0b33abf81e5087ec9142bb11a54f23cde (diff) | |
lavc: Remove old vaapi decode infrastructure
Deprecates struct vaapi_context and the installed header vaapi.h,
to be removed at the next version bump.
(cherry picked from commit 851960f6f8cf1f946fe42fa36cf6598fac68072c)
Diffstat (limited to 'libavcodec/vaapi_decode.h')
| -rw-r--r-- | libavcodec/vaapi_decode.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h index f1caa54eca..5ac3069ef3 100644 --- a/libavcodec/vaapi_decode.h +++ b/libavcodec/vaapi_decode.h @@ -26,7 +26,11 @@ #include "libavutil/hwcontext_vaapi.h" #include "avcodec.h" + +#include "version.h" +#if FF_API_STRUCT_VAAPI_CONTEXT #include "vaapi.h" +#endif static inline VASurfaceID ff_vaapi_get_surface_id(AVFrame *pic) { @@ -54,9 +58,11 @@ typedef struct VAAPIDecodeContext { VAConfigID va_config; VAContextID va_context; +#if FF_API_STRUCT_VAAPI_CONTEXT int have_old_context; struct vaapi_context *old_context; AVBufferRef *device_ref; +#endif AVHWDeviceContext *device; AVVAAPIDeviceContext *hwctx; |