Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:09:47 +0000 (04:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:09:47 +0000 (04:09 +0100)
* commit '66499f34b56fc6a9fdef25543bd9d576fc787895':
  mpegvideo: do not set current_picture_ptr in decoders

Conflicts:
libavcodec/mss2.c

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

Simple merge
@@@ -377,15 -377,7 +377,8 @@@ static int decode_wmv9(AVCodecContext *
  
      ff_mpeg_flush(avctx);
  
-     if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
-         int i = ff_find_unused_picture(s, 0);
-         if (i < 0)
-             return i;
-         s->current_picture_ptr = &s->picture[i];
-     }
 -    init_get_bits(&s->gb, buf, buf_size * 8);
 +    if ((ret = init_get_bits8(&s->gb, buf, buf_size)) < 0)
 +        return ret;
  
      s->loop_filter = avctx->skip_loop_filter < AVDISCARD_ALL;
  
Simple merge