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/ivi_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/ivi_common.c') diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index cbcd970980..715a536d38 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -767,7 +767,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, /* If the bidirectional mode is enabled, next I and the following P frame will */ /* be sent together. Unfortunately the approach below seems to be the only way */ /* to handle the B-frames mode. That's exactly the same Intel decoders do. */ - if (avctx->codec_id == CODEC_ID_INDEO4 && ctx->frame_type == 0/*FRAMETYPE_INTRA*/) { + if (avctx->codec_id == AV_CODEC_ID_INDEO4 && ctx->frame_type == 0/*FRAMETYPE_INTRA*/) { while (get_bits(&ctx->gb, 8)); // skip version string skip_bits_long(&ctx->gb, 64); // skip padding, TODO: implement correct 8-bytes alignment if (get_bits_left(&ctx->gb) > 18 && show_bits(&ctx->gb, 18) == 0x3FFF8) @@ -784,7 +784,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, } if (ctx->is_scalable) { - if (avctx->codec_id == CODEC_ID_INDEO4) + if (avctx->codec_id == AV_CODEC_ID_INDEO4) ff_ivi_recompose_haar(&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0], 4); else ff_ivi_recompose53 (&ctx->planes[0], ctx->frame.data[0], ctx->frame.linesize[0], 4); @@ -817,7 +817,7 @@ av_cold int ff_ivi_decode_close(AVCodecContext *avctx) avctx->release_buffer(avctx, &ctx->frame); #if IVI4_STREAM_ANALYSER - if (avctx->codec_id == CODEC_ID_INDEO4) { + if (avctx->codec_id == AV_CODEC_ID_INDEO4) { if (ctx->is_scalable) av_log(avctx, AV_LOG_ERROR, "This video uses scalability mode!\n"); if (ctx->uses_tiling) -- cgit v1.2.3