Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 18:03:04 +0000 (19:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 18:03:10 +0000 (19:03 +0100)
* commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04':
  error_resilience: do not require mbintra/skip tables

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

@@@ -1301,16 -1209,10 +1301,17 @@@ ec_clean
              (error & (ER_DC_ERROR | ER_MV_ERROR | ER_AC_ERROR))) {
              s->mbskip_table[mb_xy] = 0;
          }
-         s->mbintra_table[mb_xy] = 1;
+         if (s->mbintra_table)
+             s->mbintra_table[mb_xy] = 1;
      }
  
 +    for (i = 0; i < 2; i++) {
 +        av_buffer_unref(&s->ref_index_buf[i]);
 +        av_buffer_unref(&s->motion_val_buf[i]);
 +        s->cur_pic.ref_index[i]  = NULL;
 +        s->cur_pic.motion_val[i] = NULL;
 +    }
 +
      memset(&s->cur_pic, 0, sizeof(ERPicture));
      memset(&s->last_pic, 0, sizeof(ERPicture));
      memset(&s->next_pic, 0, sizeof(ERPicture));
Simple merge