Merge commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:28:17 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 09:28:28 +0000 (11:28 +0200)
* commit '27b0e6ebfd47b0c11156c18b90fa8c571f0f60c3':
  h264: drop needs_realloc

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

@@@ -378,11 -358,7 +378,8 @@@ void ff_h264_free_tables(H264Context *h
      if (free_rbsp && h->DPB) {
          for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
              ff_h264_unref_picture(h, &h->DPB[i]);
 +        memset(h->delayed_pic, 0, sizeof(h->delayed_pic));
          av_freep(&h->DPB);
-     } else if (h->DPB) {
-         for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
-             h->DPB[i].needs_realloc = 1;
      }
  
      h->cur_pic_ptr = NULL;
@@@ -322,15 -292,8 +322,14 @@@ typedef struct H264Picture 
      int mbaff;              ///< 1 -> MBAFF frame 0-> not MBAFF
      int field_picture;      ///< whether or not picture was encoded in separate fields
  
-     int needs_realloc;      ///< picture needs to be reallocated (eg due to a frame size change)
      int reference;
      int recovered;          ///< picture at IDR or recovery point + recovery count
 +    int invalid_gap;
 +    int sei_recovery_frame_cnt;
 +
 +    int crop;
 +    int crop_left;
 +    int crop_top;
  } H264Picture;
  
  typedef struct H264Ref {
@@@ -114,14 -113,8 +114,13 @@@ int ff_h264_ref_picture(H264Context *h
      dst->long_ref      = src->long_ref;
      dst->mbaff         = src->mbaff;
      dst->field_picture = src->field_picture;
-     dst->needs_realloc = src->needs_realloc;
      dst->reference     = src->reference;
 +    dst->crop          = src->crop;
 +    dst->crop_left     = src->crop_left;
 +    dst->crop_top      = src->crop_top;
      dst->recovered     = src->recovered;
 +    dst->invalid_gap   = src->invalid_gap;
 +    dst->sei_recovery_frame_cnt = src->sei_recovery_frame_cnt;
  
      return 0;
  fail:
Simple merge