[FFmpeg-cvslog] xbmdec: print more details on decode error.

[Reimar Döffinger]

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Apr 29 15:37:00 2012 +0200| [1f0c92d68bab52c852fda5a5669def27a57eaa97] | committer: Reimar Döffinger

xbmdec: print more details on decode error.

Makes debugging issues easier.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f0c92d68bab52c852fda5a5669def27a57eaa97
---

 libavcodec/xbmdec.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
index cc0d6c9..629a636 100644
--- a/libavcodec/xbmdec.c
+++ b/libavcodec/xbmdec.c
@@ -57,8 +57,10 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
         int number, len;
 
         ptr += strcspn(ptr, "#");
-        if (sscanf(ptr, "#define %256s %u", name, &number) != 2)
+        if (sscanf(ptr, "#define %256s %u", name, &number) != 2) {
+            av_log(avctx, AV_LOG_ERROR, "Unexpected preprocessor directive\n");
             return AVERROR_INVALIDDATA;
+        }
 
         len = strlen(name);
         if ((len > 6) && !avctx->height && !memcmp(name + len - 7, "_height", 7)) {
@@ -66,6 +68,7 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
         } else if ((len > 5) && !avctx->width && !memcmp(name + len - 6, "_width", 6)) {
                 avctx->width = number;
         } else {
+            av_log(avctx, AV_LOG_ERROR, "Unknown define '%s'\n", name);
             return AVERROR_INVALIDDATA;
         }
         ptr += strcspn(ptr, "\n\r") + 1;
@@ -94,6 +97,7 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
                     val = (val << 4) + convert(*ptr);
                 *dst++ = av_reverse[val];
             } else {
+                av_log(avctx, AV_LOG_ERROR, "Unexpected data at '%.8s'\n", ptr);
                 return AVERROR_INVALIDDATA;
             }
         }