Merge commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 May 2015 22:13:22 +0000 (00:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 May 2015 22:13:22 +0000 (00:13 +0200)
* commit '3b69f245dbe6e2016659a45c4bfe284f6c5ac57e':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
libavcodec/h264_slice.c

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

@@@ -1473,8 -1318,8 +1473,9 @@@ int ff_h264_decode_slice_header(H264Con
          }
      }
  
 -    if (h->context_initialized && needs_reinit) {
 +    if (h->context_initialized &&
 +        (must_reinit || needs_reinit)) {
+         h->context_initialized = 0;
          if (h != h0) {
              av_log(h->avctx, AV_LOG_ERROR,
                     "changing width %d -> %d / height %d -> %d on "