Merge commit 'c9be276f8b040e7d441a77f774afe94b6f137be6' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:54:30 +0000 (15:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 13:54:30 +0000 (15:54 +0200)
* commit 'c9be276f8b040e7d441a77f774afe94b6f137be6':
  mpegvideo: set reference/pict_type on generated reference frames

Conflicts:
libavcodec/mpegvideo.c

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

@@@ -1468,7 -1481,10 +1468,11 @@@ int ff_MPV_frame_start(MpegEncContext *
                  return i;
              }
              s->last_picture_ptr = &s->picture[i];
 -            s->last_picture_ptr->f.pict_type = AV_PICTURE_TYPE_I;
 +            s->last_picture_ptr->f.key_frame = 0;
+             s->last_picture_ptr->f.reference   = 3;
++            s->last_picture_ptr->f.pict_type = AV_PICTURE_TYPE_P;
              if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) {
                  s->last_picture_ptr = NULL;
                  return -1;
                  return i;
              }
              s->next_picture_ptr = &s->picture[i];
 -
 +            s->next_picture_ptr->f.key_frame = 0;
+             s->next_picture_ptr->f.reference   = 3;
 -            s->next_picture_ptr->f.pict_type = AV_PICTURE_TYPE_I;
++            s->next_picture_ptr->f.pict_type = AV_PICTURE_TYPE_P;
              if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) {
                  s->next_picture_ptr = NULL;
                  return -1;