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/dxva2_vc1.c | |
| parent | 28adecf0fa1fa56db17b1f0e7711acb68baf00e7 (diff) | |
| parent | c57a593670308447aa1998259a1912273cc67fe9 (diff) | |
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/dxva2_vc1.c')
| -rw-r--r-- | libavcodec/dxva2_vc1.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index cba685d268..a0810c9c77 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -211,9 +211,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; @@ -230,8 +230,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; @@ -253,7 +254,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; @@ -277,9 +278,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 @@ -289,8 +290,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), }; |