[SCM] libav/experimental: h264: informative error reporting in decode_slice_header()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fea6db064b00822af488db93f0f8b19f25cae515
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Tue Feb 18 23:47:55 2014 +0100

    h264: informative error reporting in decode_slice_header()
    
    Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3f99109..9cc32e9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3471,8 +3471,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
          h->height != h->avctx->coded_height  ||
          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;
         }
 

-- 
Libav/FFmpeg packaging