diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-09-01 16:57:20 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-09-21 13:51:53 +0200 |
| commit | e5b29c1f6b5cd17ba4f0a976a535c4003a07eb02 (patch) | |
| tree | 34b6588f378dcc7c68d7906b9ea9468a6cdb3e8f | |
| parent | feedc0754bd9fbdb1ae3453bc0555513e61d9e8d (diff) | |
lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*
| -rw-r--r-- | libavcodec/dpxenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index 7ae929238d..1ff9d97fae 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -35,7 +35,7 @@ static av_cold int encode_init(AVCodecContext *avctx) DPXContext *s = avctx->priv_data; avctx->coded_frame = &s->picture; - avctx->coded_frame->pict_type = FF_I_TYPE; + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; s->big_endian = 1; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index b4a83b45dc..6a12344139 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1167,7 +1167,7 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, const AVCode if (!ctx->mpeg_enc_ctx_allocated) memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); - if (!(s->pict_type == FF_B_TYPE || s->low_delay)) + if (!(s->pict_type == AV_PICTURE_TYPE_B || s->low_delay)) s->picture_number++; return 0; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 6839186aac..e418e95a33 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -539,7 +539,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src s->last_pict_type= s1->pict_type; if (s1->current_picture_ptr) s->last_lambda_for[s1->pict_type] = s1->current_picture_ptr->f.quality; - if(s1->pict_type!=FF_B_TYPE){ + if (s1->pict_type != AV_PICTURE_TYPE_B) { s->last_non_b_pict_type= s1->pict_type; } } @@ -2652,6 +2652,6 @@ void ff_set_qscale(MpegEncContext * s, int qscale) void MPV_report_decode_progress(MpegEncContext *s) { - if (s->pict_type != FF_B_TYPE && !s->partitioned_frame && !s->error_occurred) + if (s->pict_type != AV_PICTURE_TYPE_B && !s->partitioned_frame && !s->error_occurred) ff_thread_report_progress((AVFrame*)s->current_picture_ptr, s->mb_y, 0); } |