[FFmpeg-cvslog] avcodec/xbmdec: merge ptr increase into dereference

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 28 05:33:13 2014 +0100| [4618084a5cdd1920524a9eeba131e3658a2e6488] | committer: Michael Niedermayer

avcodec/xbmdec: merge ptr increase into dereference

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4618084a5cdd1920524a9eeba131e3658a2e6488
---

 libavcodec/xbmdec.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/xbmdec.c b/libavcodec/xbmdec.c
index b9a46d7..52b41ee 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,