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/vda_h264.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libavcodec/vda_h264.c') diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index a1efbcdc38..24f411203c 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -197,9 +197,9 @@ static int vda_sync_decode(struct vda_context *vda_ctx) } -static int start_frame(AVCodecContext *avctx, - av_unused const uint8_t *buffer, - av_unused uint32_t size) +static int vda_h264_start_frame(AVCodecContext *avctx, + av_unused const uint8_t *buffer, + av_unused uint32_t size) { struct vda_context *vda_ctx = avctx->hwaccel_context; @@ -211,9 +211,9 @@ static int start_frame(AVCodecContext *avctx, return 0; } -static int decode_slice(AVCodecContext *avctx, - const uint8_t *buffer, - uint32_t size) +static int vda_h264_decode_slice(AVCodecContext *avctx, + const uint8_t *buffer, + uint32_t size) { struct vda_context *vda_ctx = avctx->hwaccel_context; void *tmp; @@ -237,7 +237,7 @@ static int decode_slice(AVCodecContext *avctx, return 0; } -static int end_frame(AVCodecContext *avctx) +static int vda_h264_end_frame(AVCodecContext *avctx) { H264Context *h = avctx->priv_data; struct vda_context *vda_ctx = avctx->hwaccel_context; @@ -372,7 +372,7 @@ AVHWAccel ff_h264_vda_hwaccel = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .pix_fmt = AV_PIX_FMT_VDA_VLD, - .start_frame = start_frame, - .decode_slice = decode_slice, - .end_frame = end_frame, + .start_frame = vda_h264_start_frame, + .decode_slice = vda_h264_decode_slice, + .end_frame = vda_h264_end_frame, }; -- cgit v1.2.3