avconv_vaapi: Convert to use hw_frames_ctx only

[ffmpeg] / libavcodec / vaapi.c

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index b2dc41d7fe95074f9363e64525708d84efda1e74..d2aafac38e46b28d5f4be1558bb7a03c26e9e597 100644 (file)
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -21,7 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "h264.h"
+#include "h264dec.h"
+#include "mpegvideo.h"
 #include "vaapi_internal.h"
 
 /**
@@ -180,8 +181,6 @@ void ff_vaapi_common_end_frame(AVCodecContext *avctx)
 {
     struct vaapi_context * const vactx = avctx->hwaccel_context;
 
-    av_dlog(avctx, "ff_vaapi_common_end_frame()\n");
-
     destroy_buffers(vactx->display, &vactx->pic_param_buf_id, 1);
     destroy_buffers(vactx->display, &vactx->iq_matrix_buf_id, 1);
     destroy_buffers(vactx->display, &vactx->bitplane_buf_id, 1);
@@ -194,6 +193,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;
@@ -215,5 +217,6 @@ finish:
     ff_vaapi_common_end_frame(avctx);
     return ret;
 }
+#endif
 
 /* @} */