From 766b06b5f914e9a0b0f5faf02912451d12dba07e Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Fri, 18 Jul 2014 19:07:54 -0700
Subject: [PATCH] minor change

---
 src/rfxcommon.h  | 38 ++++++++++++++++++++++++++++++++------
 src/rfxcompose.c |  2 +-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/rfxcommon.h b/src/rfxcommon.h
index a27c4d6..6b4c6f8 100644
--- a/src/rfxcommon.h
+++ b/src/rfxcommon.h
@@ -48,12 +48,38 @@ typedef struct _STREAM STREAM;
 #define stream_write_uint16(_s, _v) do { ((uint16*)((_s)->p))[0] = _v; (_s)->p += 2; } while (0)
 #define stream_write_uint32(_s, _v) do { ((uint32*)((_s)->p))[0] = _v; (_s)->p += 4; } while (0)
 #else
-#define stream_read_uint8(_s, _v) do { _v = ((uint8*)((_s)->p))[0]; (_s)->p += 1; } while (0)
-#define stream_read_uint16(_s, _v) do { _v = (((uint8*)((_s)->p))[0]) || ((((uint8*)((_s)->p))[1]) << 8); (_s)->p += 2; } while (0)
-#define stream_read_uint32(_s, _v) do { _v = (((uint8*)((_s)->p))[0]) || ((((uint8*)((_s)->p))[1]) << 8) || ((((uint8*)((_s)->p))[2]) << 16) || ((((uint8*)((_s)->p))[3]) << 24); (_s)->p += 4; } while (0)
-#define stream_write_uint8(_s, _v) do { ((uint8*)((_s)->p))[0] = _v; (_s)->p += 1; } while (0)
-#define stream_write_uint16(_s, _v) do { ((uint8*)((_s)->p))[0] = (uint8)(_v); ((uint8*)((_s)->p))[1] = (uint8)((_v) >> 8); (_s)->p += 2; } while (0)
-#define stream_write_uint32(_s, _v) do { ((uint8*)((_s)->p))[0] = (uint8)(_v); ((uint8*)((_s)->p))[1] = (uint8)((_v) >> 8); ((uint8*)((_s)->p))[2] = (uint8)((_v) >> 16); ((uint8*)((_s)->p))[3] = (uint8)((_v) >> 24); (_s)->p += 4; } while (0)
+#define stream_read_uint8(_s, _v) do { \
+    _v = ((uint8*)((_s)->p))[0]; \
+    (_s)->p += 1; \
+} while (0)
+#define stream_read_uint16(_s, _v) do { \
+    _v = (((uint8*)((_s)->p))[0]) | \
+        ((((uint8*)((_s)->p))[1]) << 8); \
+    (_s)->p += 2; \
+} while (0)
+#define stream_read_uint32(_s, _v) do { \
+    _v = (((uint8*)((_s)->p))[0]) | \
+        ((((uint8*)((_s)->p))[1]) << 8) | \
+        ((((uint8*)((_s)->p))[2]) << 16) | \
+        ((((uint8*)((_s)->p))[3]) << 24); \
+    (_s)->p += 4; \
+} while (0)
+#define stream_write_uint8(_s, _v) do { \
+    ((uint8*)((_s)->p))[0] = _v; \
+    (_s)->p += 1; \
+} while (0)
+#define stream_write_uint16(_s, _v) do { \
+    ((uint8*)((_s)->p))[0] = (uint8)(_v); \
+    ((uint8*)((_s)->p))[1] = (uint8)((_v) >> 8); \
+    (_s)->p += 2; \
+} while (0)
+#define stream_write_uint32(_s, _v) do { \
+    ((uint8*)((_s)->p))[0] = (uint8)(_v); \
+    ((uint8*)((_s)->p))[1] = (uint8)((_v) >> 8); \
+    ((uint8*)((_s)->p))[2] = (uint8)((_v) >> 16); \
+    ((uint8*)((_s)->p))[3] = (uint8)((_v) >> 24); \
+    (_s)->p += 4; \
+} while (0)
 #endif
 
 #define stream_seek(_s, _n) (_s)->p += _n
diff --git a/src/rfxcompose.c b/src/rfxcompose.c
index 1a2f28f..aef02ab 100644
--- a/src/rfxcompose.c
+++ b/src/rfxcompose.c
@@ -322,7 +322,7 @@ rfx_compose_message_tileset(struct rfxencode* enc, STREAM* s,
         quantIdxCr = tiles[i].quant_cr;
         if (enc->format == RFX_FORMAT_YUV)
         {
-            tile_data = buf + y * 64 * 4 * (stride_bytes / (64 * 4)) + x * 64 * 4;
+            tile_data = buf + (y << 8) * (stride_bytes >> 8) + (x << 8);
         }
         else
         {