diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 05:33:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 05:33:13 +0100 |
| commit | 4618084a5cdd1920524a9eeba131e3658a2e6488 (patch) | |
| tree | 4229a6985fc86b2c47e7340a2759180045dca976 /libavcodec/xbmdec.c | |
| parent | 296e63efa56f1fb454cafb5c7f54dfb80cbfbab4 (diff) | |
| download | ffmpeg-4618084a5cdd1920524a9eeba131e3658a2e6488.tar.gz | |
avcodec/xbmdec: merge ptr increase into dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xbmdec.c')
| -rw-r--r-- | libavcodec/xbmdec.c | 5 |
1 files 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, |