|
|
|
@ -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); |
|
|
|
|
} |
|
|
|
|