Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:50:32 +0000 (18:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:50:32 +0000 (18:50 +0200)
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
libavcodec/h264_slice.c

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

@@@ -1419,11 -1306,7 +1419,8 @@@ int ff_h264_decode_slice_header(H264Con
          }
      }
  
 -    if (h->context_initialized && needs_reinit) {
 +    if (h->context_initialized &&
-         (h->width  != h->avctx->coded_width   ||
-          h->height != h->avctx->coded_height  ||
-          must_reinit ||
-          needs_reinit)) {
++        (must_reinit || needs_reinit)) {
          if (h != h0) {
              av_log(h->avctx, AV_LOG_ERROR,
                     "changing width %d -> %d / height %d -> %d on "