Cosmetics to improve xan_unpack readability

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18590 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 04f2b1f249d7c3704e33ef11c1984f4dd44950f7..8a7ad240ad3919fefd25594f71f61098c2f3f982 100644 (file)
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -140,22 +140,22 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l
 
                 size = opcode & 3;
 
+                back  = ((opcode & 0x60) << 3) + *src++ + 1;
                 size2 = ((opcode & 0x1c) >> 2) + 3;
-                back = ((opcode & 0x60) << 3) + *src++ + 1;
 
             } else if ( (opcode & 0x40) == 0 ) {
 
                 size = *src >> 6;
 
+                back  = (bytestream_get_be16(&src) & 0x3fff) + 1;
                 size2 = (opcode & 0x3f) + 4;
-                back = (bytestream_get_be16(&src) & 0x3fff) + 1;
 
             } else {
 
                 size = opcode & 3;
 
-                back = ((opcode & 0x10) << 12) + 1 + bytestream_get_be16(&src);
-                size2 = *src++ + 5 + ((opcode & 0xc) << 6);
+                back  = ((opcode & 0x10) << 12) + bytestream_get_be16(&src) + 1;
+                size2 = ((opcode & 0x0c) <<  6) + *src++ + 5;
                 if (size + size2 > dest_end - dest)
                     return;
             }