Commit 4618084a authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/xbmdec: merge ptr increase into dereference

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 296e63ef
...@@ -91,10 +91,9 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data, ...@@ -91,10 +91,9 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data,
ptr += strcspn(ptr, "x") + 1; ptr += strcspn(ptr, "x") + 1;
if (ptr < end && av_isxdigit(*ptr)) { if (ptr < end && av_isxdigit(*ptr)) {
val = convert(*ptr); val = convert(*ptr++);
ptr++;
if (av_isxdigit(*ptr)) if (av_isxdigit(*ptr))
val = (val << 4) + convert(*ptr); val = (val << 4) + convert(*ptr++);
*dst++ = ff_reverse[val]; *dst++ = ff_reverse[val];
} else { } else {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment