avformat/avformat, utils: Make av_find_best_stream const-correct

[ffmpeg] / libavcodec / vaapi_decode.h

diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h
index 1fcecac4682fb1fc5cc9d270fbc1defedb6ecccc..6beda14e52e8f7a593fdb44254265e6078bd050b 100644 (file)
--- a/libavcodec/vaapi_decode.h
+++ b/libavcodec/vaapi_decode.h
@@ -27,11 +27,6 @@
 
 #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)
 {
     return (uintptr_t)pic->data[3];
@@ -56,14 +51,6 @@ typedef struct VAAPIDecodeContext {
     VAConfigID            va_config;
     VAContextID           va_context;
 
-#if FF_API_STRUCT_VAAPI_CONTEXT
-FF_DISABLE_DEPRECATION_WARNINGS
-    int                   have_old_context;
-    struct vaapi_context *old_context;
-    AVBufferRef          *device_ref;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
     AVHWDeviceContext    *device;
     AVVAAPIDeviceContext *hwctx;
 
@@ -72,6 +59,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     enum AVPixelFormat    surface_format;
     int                   surface_count;
+
+    VASurfaceAttrib       pixel_format_attribute;
 } VAAPIDecodeContext;