Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 15:03:23 +0000 (16:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 15:03:23 +0000 (16:03 +0100)
* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
  h264: drop any pretense of support for data partitioning

Conflicts:
libavcodec/h264.c

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

@@@ -1814,18 -1682,14 +1775,15 @@@ static int h264_decode_frame(AVCodecCon
      int ret;
  
      h->flags = avctx->flags;
-     /* reset data partitioning here, to ensure GetBitContexts from previous
-      * packets do not get used. */
-     h->data_partitioning = 0;
  
 +    ff_h264_unref_picture(h, &h->last_pic_for_ec);
 +
      /* end of stream, output what is still in the buffers */
 -out:
      if (buf_size == 0) {
 -        H264Picture *out;
 -        int i, out_idx;
 + out:
  
          h->cur_pic_ptr = NULL;
 +        h->first_field = 0;
  
          // FIXME factorize this with the output code below
          out     = h->delayed_pic[0];
Simple merge
Simple merge