Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:52:41 +0000 (01:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:52:53 +0000 (01:52 +0100)
* commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a':
  mpegvideo: don't copy input_picture_number in update_thread_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo.c

@@@ -711,10 -683,7 +711,9 @@@ int ff_mpeg_update_thread_context(AVCod
  
      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)
      for (i = 0; i < MAX_PICTURE_COUNT; i++) {
          ff_mpeg_unref_picture(s, &s->picture[i]);
          if (s1->picture[i].f.buf[0] &&