Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'

* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6':
  vaapi: Drop pointless debug output

Merged-by: Clément Bœsch <clement@stupeflix.com>

diff --cc libavcodec/vaapi.c
index a1ea790add9d14cb7c2f2379732cdd1f649bd8b7,094692e2a2f48999f970b3aa9119a30a0cce0068..36db640f02723dfde4036c770480ff82f120bb6f
--- 1/libavcodec/vaapi.c
--- 2/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@@ -208,10 -179,8 +208,8 @@@ VASliceParameterBufferBase *ff_vaapi_al
  
  void ff_vaapi_common_end_frame(AVCodecContext *avctx)
  {
 -    struct vaapi_context * const vactx = avctx->hwaccel_context;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
  
-     ff_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);

diff --cc libavcodec/vaapi_h264.c
index 91ee2d60c7a7d4168747dfdc50404bb90a39e9e5,0925985235cc835fb96fbb1d2aa45e085f3011ff..92efb26a01f0634fef95ce1f96bfcf5062dd894a
--- 1/libavcodec/vaapi_h264.c
--- 2/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@@ -325,11 -320,8 +322,8 @@@ static int vaapi_h264_decode_slice(AVCo
      H264SliceContext *sl  = &h->slice_ctx[0];
      VASliceParameterBufferH264 *slice_param;
  
-     ff_dlog(avctx, "vaapi_h264_decode_slice(): buffer %p, size %d\n",
-             buffer, size);
- 
      /* Fill in VASliceParameterBufferH264. */
 -    slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
 +    slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(vactx, buffer, size);
      if (!slice_param)
          return -1;
      slice_param->slice_data_bit_offset          = get_bits_count(&sl->gb);

diff --cc libavcodec/vaapi_mpeg2.c
Simple merge

diff --cc libavcodec/vaapi_mpeg4.c
index b5b946dba1398c5fff234635e9cf52ab8590ca58,6743e2a47800e8f1a25207a3d25722aa237c2212..725f00b0a6b3be395973a7a806afeb41cdf2f248
--- 1/libavcodec/vaapi_mpeg4.c
--- 2/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@@ -122,13 -120,18 +120,11 @@@ static int vaapi_mpeg4_start_frame(AVCo
  static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size)
  {
      MpegEncContext * const s = avctx->priv_data;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
      VASliceParameterBufferMPEG4 *slice_param;
  
-     ff_dlog(avctx, "vaapi_mpeg4_decode_slice(): buffer %p, size %d\n", buffer, size);
 -    /* video_plane_with_short_video_header() contains all GOBs
 -     * in-order, and this is what VA API (Intel backend) expects: only
 -     * a single slice param. So fake macroblock_number for Libav so
 -     * that we don't call vaapi_mpeg4_decode_slice() again
 -     */
 -    if (avctx->codec->id == AV_CODEC_ID_H263)
 -        size = s->gb.buffer_end - buffer;
--
      /* Fill in VASliceParameterBufferMPEG4 */
 -    slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(avctx->hwaccel_context, buffer, size);
 +    slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size);
      if (!slice_param)
          return -1;
      slice_param->macroblock_offset      = get_bits_count(&s->gb) % 8;

diff --cc libavcodec/vaapi_vc1.c
index 5ded5dba896c12f2a33422d0778230922b342bac,4022549dac784bd797a613a43ca059d1226460b7..4e82be1ae1a48833efc6de422a52a99d4825429c
--- 1/libavcodec/vaapi_vc1.c
--- 2/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@@ -148,11 -148,9 +148,9 @@@ static int vaapi_vc1_start_frame(AVCode
  {
      VC1Context * const v = avctx->priv_data;
      MpegEncContext * const s = &v->s;
 -    struct vaapi_context * const vactx = avctx->hwaccel_context;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
      VAPictureParameterBufferVC1 *pic_param;
  
-     ff_dlog(avctx, "vaapi_vc1_start_frame()\n");
- 
      vactx->slice_param_size = sizeof(VASliceParameterBufferVC1);
  
      /* Fill in VAPictureParameterBufferVC1 */
@@@ -315,11 -313,8 +313,9 @@@ static int vaapi_vc1_decode_slice(AVCod
  {
      VC1Context * const v = avctx->priv_data;
      MpegEncContext * const s = &v->s;
 +    FFVAContext * const vactx = ff_vaapi_get_context(avctx);
      VASliceParameterBufferVC1 *slice_param;
  
-     ff_dlog(avctx, "vaapi_vc1_decode_slice(): buffer %p, size %d\n", buffer, size);
- 
      /* Current bit buffer is beyond any marker for VC-1, so skip it */
      if (avctx->codec_id == AV_CODEC_ID_VC1 && IS_MARKER(AV_RB32(buffer))) {
          buffer += 4;