diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 08:34:25 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 08:34:25 +0400 |
commit | 1da186676738dbded75a83d72f0739b993970d4e (patch) | |
tree | 02896302058bdfd65595840067ba1a16e1992a77 /libavcodec/xbmdec.c | |
parent | 4618084a5cdd1920524a9eeba131e3658a2e6488 (diff) |
avcodec/xbmdec: support X10 format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xbmdec.c')
-rw-r--r-- | libavcodec/xbmdec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c index 52b41ee813..203c2f9cbe 100644 --- 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); |