Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 01:24:52 +0000 (02:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 01:25:02 +0000 (02:25 +0100)
* qatar/master:
  h264: informative error reporting in decode_slice_header()

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

@@@ -3593,11 -3469,14 +3593,15 @@@ static int decode_slice_header(H264Cont
      if (h->context_initialized &&
          (h->width  != h->avctx->coded_width   ||
           h->height != h->avctx->coded_height  ||
 +         must_reinit ||
           needs_reinit)) {
          if (h != h0) {
-             av_log(h->avctx, AV_LOG_ERROR, "changing width/height on "
-                    "slice %d\n", h0->current_slice + 1);
+             av_log(h->avctx, AV_LOG_ERROR,
+                    "changing width %d -> %d / height %d -> %d on "
+                    "slice %d\n",
+                    h->width, h->avctx->coded_width,
+                    h->height, h->avctx->coded_height,
+                    h0->current_slice + 1);
              return AVERROR_INVALIDDATA;
          }