# HG changeset patch
# User melanson
# Date 1079237048 0
# Node ID 39ad6cd5d4a674c454e80c6744734efbd7c7651d
# Parent  56ccec0d08bdfc1ca54c38634fe34548a4846e8c
remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG ->
MKTAG/MKBETAG

diff -r 56ccec0d08bd -r 39ad6cd5d4a6 adpcm.c
--- a/adpcm.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/adpcm.c	Sun Mar 14 04:04:08 2004 +0000
@@ -45,13 +45,6 @@
 
 #define BLKSIZE 1024
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
-                   (((uint8_t*)(x))[2] << 16) | \
-                   (((uint8_t*)(x))[1] << 8) | \
-                    ((uint8_t*)(x))[0])
-
 #define CLAMP_TO_SHORT(value) \
 if (value > 32767) \
     value = 32767; \
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 avcodec.h
--- a/avcodec.h	Sat Mar 13 22:01:32 2004 +0000
+++ b/avcodec.h	Sun Mar 14 04:04:08 2004 +0000
@@ -2118,6 +2118,18 @@
 extern void av_log_set_level(int);
 extern void av_log_set_callback(void (*)(void*, int, const char*, va_list));
 
+/* endian macros */
+#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
+#define BE_32(x)  ((((uint8_t*)(x))[0] << 24) | \
+                   (((uint8_t*)(x))[1] << 16) | \
+                   (((uint8_t*)(x))[2] << 8) | \
+                    ((uint8_t*)(x))[3])
+#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
+#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
+                   (((uint8_t*)(x))[2] << 16) | \
+                   (((uint8_t*)(x))[1] << 8) | \
+                    ((uint8_t*)(x))[0])
+
 #ifdef __cplusplus
 }
 #endif
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 cinepak.c
--- a/cinepak.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/cinepak.c	Sun Mar 14 04:04:08 2004 +0000
@@ -37,12 +37,6 @@
 
 #define PALETTE_COUNT 256
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define BE_32(x)  ((((uint8_t*)(x))[0] << 24) | \
-                   (((uint8_t*)(x))[1] << 16) | \
-                   (((uint8_t*)(x))[2] << 8) | \
-                    ((uint8_t*)(x))[3])
-
 typedef struct {
     uint8_t  y0, y1, y2, y3;
     uint8_t  u, v;
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 dpcm.c
--- a/dpcm.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/dpcm.c	Sun Mar 14 04:04:08 2004 +0000
@@ -44,11 +44,6 @@
 #define SATURATE_S16(x)  if (x < -32768) x = -32768; \
   else if (x > 32767) x = 32767;
 #define SE_16BIT(x)  if (x & 0x8000) x -= 0x10000;
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
-                   (((uint8_t*)(x))[2] << 16) | \
-                   (((uint8_t*)(x))[1] << 8) | \
-                    ((uint8_t*)(x))[0])
 
 static int interplay_delta_table[] = {
          0,      1,      2,      3,      4,      5,      6,      7,
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 flicvideo.c
--- a/flicvideo.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/flicvideo.c	Sun Mar 14 04:04:08 2004 +0000
@@ -51,12 +51,6 @@
 #define FLI_COPY      16
 #define FLI_MINI      18
 
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
-                   (((uint8_t*)(x))[2] << 16) | \
-                   (((uint8_t*)(x))[1] << 8) | \
-                    ((uint8_t*)(x))[0])
-
 typedef struct FlicDecodeContext {
     AVCodecContext *avctx;
     AVFrame frame;
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 msvideo1.c
--- a/msvideo1.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/msvideo1.c	Sun Mar 14 04:04:08 2004 +0000
@@ -39,7 +39,6 @@
 #include "dsputil.h"
 
 #define PALETTE_COUNT 256
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
 #define CHECK_STREAM_PTR(n) \
   if ((stream_ptr + n) > s->size ) { \
     av_log(s->avctx, AV_LOG_ERROR, " MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 qtrle.c
--- a/qtrle.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/qtrle.c	Sun Mar 14 04:04:08 2004 +0000
@@ -26,8 +26,8 @@
  *
  * The QT RLE decoder has seven modes of operation:
  * 1, 2, 4, 8, 16, 24, and 32 bits per pixel. For modes 1, 2, 4, and 8
- * the decoder outputs PAL8 colorspace data. 16-bit data yields RGB24
- * data. 24-bit data is RGB888 and 32-bit data is RGBA32.
+ * the decoder outputs PAL8 colorspace data. 16-bit data yields RGB555
+ * data. 24-bit data is RGB24 and 32-bit data is RGBA32.
  */
 
 #include <stdio.h>
@@ -50,8 +50,6 @@
 
 } QtrleContext;
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-
 #define CHECK_STREAM_PTR(n) \
   if ((stream_ptr + n) > s->size) { \
     av_log (s->avctx, AV_LOG_INFO, "Problem: stream_ptr out of bounds (%d >= %d)\n", \
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 rpza.c
--- a/rpza.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/rpza.c	Sun Mar 14 04:04:08 2004 +0000
@@ -53,12 +53,6 @@
 
 } RpzaContext;
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define BE_32(x)  ((((uint8_t*)(x))[0] << 24) | \
-                   (((uint8_t*)(x))[1] << 16) | \
-                   (((uint8_t*)(x))[2] << 8) | \
-                    ((uint8_t*)(x))[3])
-
 #define ADVANCE_BLOCK() \
 { \
     pixel_ptr += 4; \
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 smc.c
--- a/smc.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/smc.c	Sun Mar 14 04:04:08 2004 +0000
@@ -61,11 +61,6 @@
 
 } SmcContext;
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define BE_32(x)  ((((uint8_t*)(x))[0] << 24) | \
-                   (((uint8_t*)(x))[1] << 16) | \
-                   (((uint8_t*)(x))[2] << 8) | \
-                    ((uint8_t*)(x))[3])
 #define GET_BLOCK_COUNT() \
   (opcode & 0x10) ? (1 + s->buf[stream_ptr++]) : 1 + (opcode & 0x0F);
 
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 svq3.c
--- a/svq3.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/svq3.c	Sun Mar 14 04:04:08 2004 +0000
@@ -799,9 +799,7 @@
         break;
       extradata++;
     }
-
-    size = (extradata[4] << 24) | (extradata[5] << 16) |
-      (extradata[6] << 8) | extradata[7];
+    size = BE_32(&extradata[4]);
 
     /* if a match was found, parse the extra data */
     if (!memcmp (extradata, "SEQH", 4)) {
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 truemotion1.c
--- a/truemotion1.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/truemotion1.c	Sun Mar 14 04:04:08 2004 +0000
@@ -41,8 +41,6 @@
 
 #include "truemotion1data.h"
 
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-
 typedef struct TrueMotion1Context {
     AVCodecContext *avctx;
     AVFrame frame;
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 vqavideo.c
--- a/vqavideo.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/vqavideo.c	Sun Mar 14 04:04:08 2004 +0000
@@ -82,26 +82,13 @@
 #define MAX_VECTORS (MAX_CODEBOOK_VECTORS + SOLID_PIXEL_VECTORS)
 #define MAX_CODEBOOK_SIZE (MAX_VECTORS * 4 * 4)
 
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define BE_32(x)  ((((uint8_t*)(x))[0] << 24) | \
-                   (((uint8_t*)(x))[1] << 16) | \
-                   (((uint8_t*)(x))[2] << 8) | \
-                    ((uint8_t*)(x))[3])
-
-#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
-        ( (long)(unsigned char)(ch3) | \
-        ( (long)(unsigned char)(ch2) << 8 ) | \
-        ( (long)(unsigned char)(ch1) << 16 ) | \
-        ( (long)(unsigned char)(ch0) << 24 ) )
-
-#define CBF0_TAG FOURCC_TAG('C', 'B', 'F', '0')
-#define CBFZ_TAG FOURCC_TAG('C', 'B', 'F', 'Z')
-#define CBP0_TAG FOURCC_TAG('C', 'B', 'P', '0')
-#define CBPZ_TAG FOURCC_TAG('C', 'B', 'P', 'Z')
-#define CPL0_TAG FOURCC_TAG('C', 'P', 'L', '0')
-#define CPLZ_TAG FOURCC_TAG('C', 'P', 'L', 'Z')
-#define VPTZ_TAG FOURCC_TAG('V', 'P', 'T', 'Z')
+#define CBF0_TAG MKBETAG('C', 'B', 'F', '0')
+#define CBFZ_TAG MKBETAG('C', 'B', 'F', 'Z')
+#define CBP0_TAG MKBETAG('C', 'B', 'P', '0')
+#define CBPZ_TAG MKBETAG('C', 'B', 'P', 'Z')
+#define CPL0_TAG MKBETAG('C', 'P', 'L', '0')
+#define CPLZ_TAG MKBETAG('C', 'P', 'L', 'Z')
+#define VPTZ_TAG MKBETAG('V', 'P', 'T', 'Z')
 
 #define VQA_DEBUG 0
 
diff -r 56ccec0d08bd -r 39ad6cd5d4a6 xan.c
--- a/xan.c	Sat Mar 13 22:01:32 2004 +0000
+++ b/xan.c	Sun Mar 14 04:04:08 2004 +0000
@@ -58,13 +58,6 @@
 
 } XanContext;
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
-#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
-                   (((uint8_t*)(x))[2] << 16) | \
-                   (((uint8_t*)(x))[1] << 8) | \
-                    ((uint8_t*)(x))[0])
-
 /* RGB -> YUV conversion stuff */
 #define SCALEFACTOR 65536
 #define CENTERSAMPLE 128