From 7099f36578252935157be322bc9a34d0c861f83e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 2 Jan 2012 17:49:38 +0000 Subject: [PATCH] lavc: replace rest of deprecated FF_*_TYPE with AV_PICTURE_TYPE_* Signed-off-by: Michael Niedermayer --- libavcodec/bintext.c | 2 +- libavcodec/flashsv2enc.c | 4 ++-- libavcodec/j2kdec.c | 2 +- libavcodec/msvideo1enc.c | 2 +- libavcodec/proresdec2.c | 2 +- libavcodec/v410dec.c | 2 +- libavcodec/v410enc.c | 2 +- libavcodec/vble.c | 2 +- libavcodec/y41pdec.c | 2 +- libavcodec/y41penc.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index 0b46dd444e..91167ba150 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -139,7 +139,7 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - s->frame.pict_type = FF_I_TYPE; + s->frame.pict_type = AV_PICTURE_TYPE_I; s->frame.palette_has_changed = 1; memcpy(s->frame.data[1], s->palette, 16 * 4); diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 9f7017e033..6466be7858 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -870,12 +870,12 @@ static int flashsv2_encode_frame(AVCodecContext * avctx, uint8_t * buf, if (keyframe) { new_key_frame(s); - p->pict_type = FF_I_TYPE; + p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; s->last_key_frame = avctx->frame_number; av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n", avctx->frame_number); } else { - p->pict_type = FF_P_TYPE; + p->pict_type = AV_PICTURE_TYPE_P; p->key_frame = 0; } diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 6989aa1cd7..2cbd7cc529 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -274,7 +274,7 @@ static int get_siz(J2kDecoderContext *s) if ((ret = s->avctx->get_buffer(s->avctx, &s->picture)) < 0) return ret; - s->picture.pict_type = FF_I_TYPE; + s->picture.pict_type = AV_PICTURE_TYPE_I; s->picture.key_frame = 1; return 0; diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c index 401ac2a2ae..971cce35e6 100644 --- a/libavcodec/msvideo1enc.c +++ b/libavcodec/msvideo1enc.c @@ -243,7 +243,7 @@ static int encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_size, void c->keyint = 0; else c->keyint++; - p->pict_type= keyframe ? FF_I_TYPE : FF_P_TYPE; + p->pict_type= keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; p->key_frame= keyframe; return dst - buf; diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 18decae116..fe4cfd09b8 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -73,7 +73,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_proresdsp_init(&ctx->prodsp, avctx); avctx->coded_frame = &ctx->frame; - ctx->frame.type = FF_I_TYPE; + ctx->frame.type = AV_PICTURE_TYPE_I; ctx->frame.key_frame = 1; ff_init_scantable_permutation(idct_permutation, diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index f600b5d493..10d73057af 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -67,7 +67,7 @@ static int v410_decode_frame(AVCodecContext *avctx, void *data, } pic->key_frame = 1; - pic->pict_type = FF_I_TYPE; + pic->pict_type = AV_PICTURE_TYPE_I; y = (uint16_t *)pic->data[0]; u = (uint16_t *)pic->data[1]; diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index e7d9c4e384..bcd7c65bdc 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -57,7 +57,7 @@ static int v410_encode_frame(AVCodecContext *avctx, uint8_t *buf, avctx->coded_frame->reference = 0; avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = FF_I_TYPE; + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; y = (uint16_t *)pic->data[0]; u = (uint16_t *)pic->data[1]; diff --git a/libavcodec/vble.c b/libavcodec/vble.c index cee153c979..57b3599ddb 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -134,7 +134,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size, /* Set flags */ pic->key_frame = 1; - pic->pict_type = FF_I_TYPE; + pic->pict_type = AV_PICTURE_TYPE_I; /* Version should always be 1 */ version = AV_RL32(src); diff --git a/libavcodec/y41pdec.c b/libavcodec/y41pdec.c index ea9bf9282a..e66546b0fa 100644 --- a/libavcodec/y41pdec.c +++ b/libavcodec/y41pdec.c @@ -64,7 +64,7 @@ static int y41p_decode_frame(AVCodecContext *avctx, void *data, } pic->key_frame = 1; - pic->pict_type = FF_I_TYPE; + pic->pict_type = AV_PICTURE_TYPE_I; for (i = avctx->height - 1; i >= 0 ; i--) { y = &pic->data[0][i * pic->linesize[0]]; diff --git a/libavcodec/y41penc.c b/libavcodec/y41penc.c index b8b4a2e43b..aa32403a45 100644 --- a/libavcodec/y41penc.c +++ b/libavcodec/y41penc.c @@ -54,7 +54,7 @@ static int y41p_encode_frame(AVCodecContext *avctx, uint8_t *buf, avctx->coded_frame->reference = 0; avctx->coded_frame->key_frame = 1; - avctx->coded_frame->pict_type = FF_I_TYPE; + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; for (i = avctx->height - 1; i >= 0; i--) { y = &pic->data[0][i * pic->linesize[0]];