Commit e3b7f0e1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd0d111d0'

* commit 'd0d111d0':
  mpegvideo: remove commented out cruft from ff_MPV_frame_end()

Conflicts:
	libavcodec/mpegvideo.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b6e7834a d0d111d0
...@@ -1743,24 +1743,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -1743,24 +1743,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
emms_c(); emms_c();
#if 0
/* copy back current_picture variables */
for (i = 0; i < MAX_PICTURE_COUNT; i++) {
if (s->picture[i].f.data[0] == s->current_picture.f.data[0]) {
s->picture[i] = s->current_picture;
break;
}
}
av_assert0(i < MAX_PICTURE_COUNT);
#endif
// clear copies, to avoid confusion
#if 0
memset(&s->last_picture, 0, sizeof(Picture));
memset(&s->next_picture, 0, sizeof(Picture));
memset(&s->current_picture, 0, sizeof(Picture));
#endif
if (s->current_picture.reference) if (s->current_picture.reference)
ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0); ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 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