From 36ef5369ee9b336febc2c270f8718cec4476cb85 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 5 Aug 2012 11:11:04 +0200 Subject: Replace all CODEC_ID_* with AV_CODEC_ID_* --- libavcodec/dxva2_vc1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/dxva2_vc1.c') diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c index 2b0480baa9..487f5fca17 100644 --- a/libavcodec/dxva2_vc1.c +++ b/libavcodec/dxva2_vc1.c @@ -167,7 +167,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, DXVA_SliceInfo *slice = &ctx_pic->si; static const uint8_t start_code[] = { 0, 0, 1, 0x0d }; - const unsigned start_code_size = avctx->codec_id == CODEC_ID_VC1 ? sizeof(start_code) : 0; + const unsigned start_code_size = avctx->codec_id == AV_CODEC_ID_VC1 ? sizeof(start_code) : 0; const unsigned slice_size = slice->dwSliceBitsInBuffer / 8; const unsigned padding = 128 - ((start_code_size + slice_size) & 127); const unsigned data_size = start_code_size + slice_size + padding; @@ -237,7 +237,7 @@ static int decode_slice(AVCodecContext *avctx, if (ctx_pic->bitstream_size > 0) return -1; - if (avctx->codec_id == CODEC_ID_VC1 && + if (avctx->codec_id == AV_CODEC_ID_VC1 && size >= 4 && IS_MARKER(AV_RB32(buffer))) { buffer += 4; size -= 4; @@ -268,7 +268,7 @@ static int end_frame(AVCodecContext *avctx) AVHWAccel ff_wmv3_dxva2_hwaccel = { .name = "wmv3_dxva2", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_WMV3, + .id = AV_CODEC_ID_WMV3, .pix_fmt = PIX_FMT_DXVA2_VLD, .start_frame = start_frame, .decode_slice = decode_slice, @@ -280,7 +280,7 @@ AVHWAccel ff_wmv3_dxva2_hwaccel = { AVHWAccel ff_vc1_dxva2_hwaccel = { .name = "vc1_dxva2", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_VC1, + .id = AV_CODEC_ID_VC1, .pix_fmt = PIX_FMT_DXVA2_VLD, .start_frame = start_frame, .decode_slice = decode_slice, -- cgit v1.2.3