avcodec/xbmdec: support X10 format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 1da1866767
parent 4618084a5c
commit 1da1866767
1 changed files with 7 additions and 0 deletions
--- a/libavcodec/xbmdec.c
+++ b/libavcodec/xbmdec.c
@ -95,6 +95,13 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
                if (av_isxdigit(*ptr))
                    val = (val << 4) + convert(*ptr++);
                *dst++ = ff_reverse[val];
+                if (av_isxdigit(*ptr) && j+1 < linesize) {
+                    j++;
+                    val = convert(*ptr++);
+                    if (av_isxdigit(*ptr))
+                        val = (val << 4) + convert(*ptr++);
+                    *dst++ = ff_reverse[val];
+                }
            } else {
                av_log(avctx, AV_LOG_ERROR,
                       "Unexpected data at %.8s.\n", ptr);