RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/xbmdec: merge ptr increase into dereference 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-28 05:33:13 +01:00
parent 296e63efa5
commit 4618084a5c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/xbmdec.c
View File

@ -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,