aac_adtstoasc_bsf: Check extradata memory allocation

[ffmpeg] / libavcodec / vaapi.c

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index 6183d0b1f0876557db616ab6ede553bf71bd44f2..fcc6243899ac51271d07984e8179ed8c094947b4 100644 (file)
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -194,6 +194,9 @@ void ff_vaapi_common_end_frame(AVCodecContext *avctx)
     vactx->slice_params_alloc  = 0;
 }
 
+#if CONFIG_H263_VAAPI_HWACCEL  || CONFIG_MPEG1_VAAPI_HWACCEL || \
+    CONFIG_MPEG2_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL || \
+    CONFIG_VC1_VAAPI_HWACCEL   || CONFIG_WMV3_VAAPI_HWACCEL
 int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx)
 {
     struct vaapi_context * const vactx = avctx->hwaccel_context;
@@ -205,7 +208,7 @@ int ff_vaapi_mpeg_end_frame(AVCodecContext *avctx)
         goto finish;
 
     ret = ff_vaapi_render_picture(vactx,
-                                  ff_vaapi_get_surface_id(&s->current_picture_ptr->f));
+                                  ff_vaapi_get_surface_id(s->current_picture_ptr->f));
     if (ret < 0)
         goto finish;
 
@@ -215,5 +218,6 @@ finish:
     ff_vaapi_common_end_frame(avctx);
     return ret;
 }
+#endif
 
 /* @} */