Commit e5b29c1f authored by Anton Khirnov's avatar Anton Khirnov

lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_*

parent feedc075
...@@ -35,7 +35,7 @@ static av_cold int encode_init(AVCodecContext *avctx) ...@@ -35,7 +35,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
DPXContext *s = avctx->priv_data; DPXContext *s = avctx->priv_data;
avctx->coded_frame = &s->picture; 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; avctx->coded_frame->key_frame = 1;
s->big_endian = 1; s->big_endian = 1;
......
...@@ -1167,7 +1167,7 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, const AVCode ...@@ -1167,7 +1167,7 @@ static int mpeg_decode_update_thread_context(AVCodecContext *avctx, const AVCode
if (!ctx->mpeg_enc_ctx_allocated) if (!ctx->mpeg_enc_ctx_allocated)
memcpy(s + 1, s1 + 1, sizeof(Mpeg1Context) - sizeof(MpegEncContext)); 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++; s->picture_number++;
return 0; return 0;
......
...@@ -539,7 +539,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src ...@@ -539,7 +539,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, const AVCodecContext *src
s->last_pict_type= s1->pict_type; 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->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; s->last_non_b_pict_type= s1->pict_type;
} }
} }
...@@ -2652,6 +2652,6 @@ void ff_set_qscale(MpegEncContext * s, int qscale) ...@@ -2652,6 +2652,6 @@ void ff_set_qscale(MpegEncContext * s, int qscale)
void MPV_report_decode_progress(MpegEncContext *s) 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); ff_thread_report_progress((AVFrame*)s->current_picture_ptr, s->mb_y, 0);
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment