From c57a593670308447aa1998259a1912273cc67fe9 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 22 Feb 2013 21:25:00 +0100 Subject: hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice Some hwaccels use name prefixes, some do not, others only use them for some codecs. Add prefixes everywhere for consistency. --- libavcodec/dxva2_vc1.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'libavcodec/dxva2_vc1.c') diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 076705574e..106c8dae01 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -208,9 +208,9 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, slice, sizeof(*slice), bs->NumMBsInBuffer); } -static int start_frame(AVCodecContext *avctx, - av_unused const uint8_t *buffer, - av_unused uint32_t size) +static int dxva2_vc1_start_frame(AVCodecContext *avctx, + av_unused const uint8_t *buffer, + av_unused uint32_t size) { const VC1Context *v = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; @@ -227,8 +227,9 @@ static int start_frame(AVCodecContext *avctx, return 0; } -static int decode_slice(AVCodecContext *avctx, - const uint8_t *buffer, uint32_t size) +static int dxva2_vc1_decode_slice(AVCodecContext *avctx, + const uint8_t *buffer, + uint32_t size) { const VC1Context *v = avctx->priv_data; const Picture *current_picture = v->s.current_picture_ptr; @@ -250,7 +251,7 @@ static int decode_slice(AVCodecContext *avctx, return 0; } -static int end_frame(AVCodecContext *avctx) +static int dxva2_vc1_end_frame(AVCodecContext *avctx) { VC1Context *v = avctx->priv_data; struct dxva2_picture_context *ctx_pic = v->s.current_picture_ptr->f.hwaccel_picture_private; @@ -274,9 +275,9 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_WMV3, .pix_fmt = AV_PIX_FMT_DXVA2_VLD, - .start_frame = start_frame, - .decode_slice = decode_slice, - .end_frame = end_frame, + .start_frame = dxva2_vc1_start_frame, + .decode_slice = dxva2_vc1_decode_slice, + .end_frame = dxva2_vc1_end_frame, .priv_data_size = sizeof(struct dxva2_picture_context), }; #endif @@ -286,8 +287,8 @@ AVHWAccel ff_vc1_dxva2_hwaccel = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VC1, .pix_fmt = AV_PIX_FMT_DXVA2_VLD, - .start_frame = start_frame, - .decode_slice = decode_slice, - .end_frame = end_frame, + .start_frame = dxva2_vc1_start_frame, + .decode_slice = dxva2_vc1_decode_slice, + .end_frame = dxva2_vc1_end_frame, .priv_data_size = sizeof(struct dxva2_picture_context), }; -- cgit v1.2.3