Merge commit 'f4bd9fe326ad1315a74206939ae56df93b940a09'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:03:37 +0000 (05:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:03:59 +0000 (05:03 +0100)
* commit 'f4bd9fe326ad1315a74206939ae56df93b940a09':
  h264: fix clang warning about uninitialized variable

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

@@@ -552,10 -535,12 +552,10 @@@ static int check_opcodes(MMCO *mmco1, M
  int ff_generate_sliding_window_mmcos(H264Context *h, int first_slice)
  {
      MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp;
-     int mmco_index = 0, i;
+     int mmco_index = 0, i = 0;
  
 -    assert(h->long_ref_count + h->short_ref_count <= h->sps.ref_frame_count);
 -
      if (h->short_ref_count &&
 -        h->long_ref_count + h->short_ref_count == h->sps.ref_frame_count &&
 +        h->long_ref_count + h->short_ref_count >= h->sps.ref_frame_count &&
          !(FIELD_PICTURE(h) && !h->first_field && h->cur_pic_ptr->reference)) {
          mmco[0].opcode        = MMCO_SHORT2UNUSED;
          mmco[0].short_pic_num = h->short_ref[h->short_ref_count - 1]->frame_num;