diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 11:11:04 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 16:00:24 +0200 |
| commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
| tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavcodec/h264.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
| download | ffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index dcb9e00c43..2019de26ba 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1068,7 +1068,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) h->prev_poc_msb = 1 << 16; h->x264_build = -1; ff_h264_reset_sei(h); - if (avctx->codec_id == CODEC_ID_H264) { + if (avctx->codec_id == AV_CODEC_ID_H264) { if (avctx->ticks_per_frame == 1) s->avctx->time_base.den *= 2; avctx->ticks_per_frame = 2; @@ -1290,7 +1290,7 @@ int ff_h264_frame_start(H264Context *h) * SVQ3 as well as most other codecs have only last/next/current and thus * get released even with set reference, besides SVQ3 and others do not * mark frames as reference later "naturally". */ - if (s->codec_id != CODEC_ID_SVQ3) + if (s->codec_id != AV_CODEC_ID_SVQ3) s->current_picture_ptr->f.reference = 0; s->current_picture_ptr->field_poc[0] = @@ -3447,7 +3447,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) s->mb_skip_run = -1; h->is_complex = FRAME_MBAFF || s->picture_structure != PICT_FRAME || - s->codec_id != CODEC_ID_H264 || + s->codec_id != AV_CODEC_ID_H264 || (CONFIG_GRAY && (s->flags & CODEC_FLAG_GRAY)); if (h->pps.cabac) { @@ -4090,7 +4090,7 @@ static const AVProfile profiles[] = { AVCodec ff_h264_decoder = { .name = "h264", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_H264, + .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, .close = h264_decode_end, @@ -4109,7 +4109,7 @@ AVCodec ff_h264_decoder = { AVCodec ff_h264_vdpau_decoder = { .name = "h264_vdpau", .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_H264, + .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, .close = h264_decode_end, |