|
|
@ -1157,11 +1157,7 @@ void ff_er_frame_end(MpegEncContext *s) |
|
|
|
int time_pp = s->pp_time; |
|
|
|
int time_pp = s->pp_time; |
|
|
|
int time_pb = s->pb_time; |
|
|
|
int time_pb = s->pb_time; |
|
|
|
|
|
|
|
|
|
|
|
if (s->avctx->codec_id == AV_CODEC_ID_H264) { |
|
|
|
ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0); |
|
|
|
// FIXME
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
ff_thread_await_progress(&s->next_picture_ptr->f, mb_y, 0); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
s->mv[0][0][0] = s->next_picture.f.motion_val[0][xy][0] * time_pb / time_pp; |
|
|
|
s->mv[0][0][0] = s->next_picture.f.motion_val[0][xy][0] * time_pb / time_pp; |
|
|
|
s->mv[0][0][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp; |
|
|
|
s->mv[0][0][1] = s->next_picture.f.motion_val[0][xy][1] * time_pb / time_pp; |
|
|
|
s->mv[1][0][0] = s->next_picture.f.motion_val[0][xy][0] * (time_pb - time_pp) / time_pp; |
|
|
|
s->mv[1][0][0] = s->next_picture.f.motion_val[0][xy][0] * (time_pb - time_pp) / time_pp; |
|
|
|