From 4618084a5cdd1920524a9eeba131e3658a2e6488 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 28 Mar 2014 05:33:13 +0100 Subject: [PATCH] avcodec/xbmdec: merge ptr increase into dereference Signed-off-by: Michael Niedermayer --- libavcodec/xbmdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c index b9a46d74d0..52b41ee813 100644 --- a/libavcodec/xbmdec.c +++ b/libavcodec/xbmdec.c @@ -91,10 +91,9 @@ static int xbm_decode_frame(AVCodecContext *avctx, void *data, ptr += strcspn(ptr, "x") + 1; if (ptr < end && av_isxdigit(*ptr)) { - val = convert(*ptr); - ptr++; + val = convert(*ptr++); if (av_isxdigit(*ptr)) - val = (val << 4) + convert(*ptr); + val = (val << 4) + convert(*ptr++); *dst++ = ff_reverse[val]; } else { av_log(avctx, AV_LOG_ERROR,