From: Reimar Döffinger Date: Sat, 5 Sep 2009 19:14:44 +0000 (+0000) Subject: Slightly simplify detection of end of compressed data in xan_unpack X-Git-Tag: v0.6~3426 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=64b8e620cbbe3d2f726ccfa80323876b8f8bfc5c Slightly simplify detection of end of compressed data in xan_unpack Originally committed as revision 19772 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 91c22c3d2f..c2d4007ccb 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -156,12 +156,8 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l av_memcpy_backptr(dest, back, size2); dest += size2; } else { - int finish; - size = ((opcode & 0x1f) << 2) + 4; - - finish = size > 0x70; - if (finish) - size = opcode & 3; + int finish = opcode >= 0xfc; + size = finish ? opcode & 3 : ((opcode & 0x1f) << 2) + 4; memcpy(dest, src, size); dest += size; src += size; if (finish)