Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'

* commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a':
  mpegvideo: don't copy input_picture_number in update_thread_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-06 01:52:41 +01:00
commit 16338b4fb9

View File

@ -711,7 +711,6 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst,
s->coded_picture_number = s1->coded_picture_number;
s->picture_number = s1->picture_number;
s->input_picture_number = s1->input_picture_number;
av_assert0(!s->picture || s->picture != s1->picture);
if(s->picture)