diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 10:34:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 10:34:14 +0100 |
| commit | baf10ad186edb9da522e44c332372d52a5c6b336 (patch) | |
| tree | 8d53b708f59c4ea0235cf034b59d89863ebd69e0 /libavcodec/vda_h264.c | |
| parent | 28adecf0fa1fa56db17b1f0e7711acb68baf00e7 (diff) | |
| parent | c57a593670308447aa1998259a1912273cc67fe9 (diff) | |
| download | ffmpeg-baf10ad186edb9da522e44c332372d52a5c6b336.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: consistent name prefixes for start_frame/end_frame/decode_slice
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vda_h264.c')
| -rw-r--r-- | libavcodec/vda_h264.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index c24f4b1166..23e2b51856 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -199,9 +199,10 @@ static int vda_sync_decode(struct vda_context *vda_ctx) return status; } -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; @@ -213,9 +214,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; @@ -239,7 +240,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; @@ -376,7 +377,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, }; |