aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2016-06-21 15:36:43 +0200
committerClément Bœsch <clement@stupeflix.com>2016-06-21 15:36:43 +0200
commitd12cce3fb25e6bb3b7a2b3874fd576a786ccc6b6 (patch)
treea14e358ba30363ae39cf96bfff7c4ee8a1bc1430
parent14762dd3f3bb8c38a47033ce054058bcf9d30b08 (diff)
parent5f1c3cbd524728317bf460259aa8f3ef5ec935c6 (diff)
downloadffmpeg-d12cce3fb25e6bb3b7a2b3874fd576a786ccc6b6.tar.gz
Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'
* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6': vaapi: Drop pointless debug output Merged-by: Clément Bœsch <clement@stupeflix.com>
-rw-r--r--libavcodec/vaapi.c2
-rw-r--r--libavcodec/vaapi_h264.c6
-rw-r--r--libavcodec/vaapi_mpeg2.c4
-rw-r--r--libavcodec/vaapi_mpeg4.c4
-rw-r--r--libavcodec/vaapi_vc1.c4
5 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index a1ea790add..36db640f02 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -210,8 +210,6 @@ void ff_vaapi_common_end_frame(AVCodecContext *avctx)
{
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 --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 91ee2d60c7..92efb26a01 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -233,8 +233,6 @@ static int vaapi_h264_start_frame(AVCodecContext *avctx,
VAPictureParameterBufferH264 *pic_param;
VAIQMatrixBufferH264 *iq_matrix;
- ff_dlog(avctx, "vaapi_h264_start_frame()\n");
-
vactx->slice_param_size = sizeof(VASliceParameterBufferH264);
/* Fill in VAPictureParameterBufferH264. */
@@ -299,7 +297,6 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
H264SliceContext *sl = &h->slice_ctx[0];
int ret;
- ff_dlog(avctx, "vaapi_h264_end_frame()\n");
ret = ff_vaapi_commit_slices(vactx);
if (ret < 0)
goto finish;
@@ -325,9 +322,6 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
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(vactx, buffer, size);
if (!slice_param)
diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
index 518fec0493..9329e5450a 100644
--- a/libavcodec/vaapi_mpeg2.c
+++ b/libavcodec/vaapi_mpeg2.c
@@ -46,8 +46,6 @@ static int vaapi_mpeg2_start_frame(AVCodecContext *avctx, av_unused const uint8_
VAIQMatrixBufferMPEG2 *iq_matrix;
int i;
- ff_dlog(avctx, "vaapi_mpeg2_start_frame()\n");
-
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG2);
/* Fill in VAPictureParameterBufferMPEG2 */
@@ -109,8 +107,6 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
GetBitContext gb;
uint32_t quantiser_scale_code, intra_slice_flag, macroblock_offset;
- ff_dlog(avctx, "vaapi_mpeg2_decode_slice(): buffer %p, size %d\n", buffer, size);
-
/* Determine macroblock_offset */
init_get_bits(&gb, buffer, 8 * size);
if (get_bits_long(&gb, 32) >> 8 != 1) /* start code */
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index b5b946dba1..725f00b0a6 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -51,8 +51,6 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
VAIQMatrixBufferMPEG4 *iq_matrix;
int i;
- ff_dlog(avctx, "vaapi_mpeg4_start_frame()\n");
-
vactx->slice_param_size = sizeof(VASliceParameterBufferMPEG4);
/* Fill in VAPictureParameterBufferMPEG4 */
@@ -125,8 +123,6 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
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);
-
/* Fill in VASliceParameterBufferMPEG4 */
slice_param = (VASliceParameterBufferMPEG4 *)ff_vaapi_alloc_slice(vactx, buffer, size);
if (!slice_param)
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
index 5ded5dba89..4e82be1ae1 100644
--- a/libavcodec/vaapi_vc1.c
+++ b/libavcodec/vaapi_vc1.c
@@ -151,8 +151,6 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, av_unused const uint8_t
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 */
@@ -318,8 +316,6 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
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;