dvbsubdec: Fix function return type

[ffmpeg] / libavcodec / indeo3data.h

diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h
index a19fdd3e83c943ca574fbb455cb76eff69bc56d1..28c9bb606176b91a7bd5db7d664ddc4c2bbd43cf 100644 (file)
--- a/libavcodec/indeo3data.h
+++ b/libavcodec/indeo3data.h
@@ -24,6 +24,8 @@
 
 #include <stdint.h>
 
+#include "config.h"
+
 /*
  * Define compressed VQ tables.
  */
@@ -233,7 +235,7 @@
 
 /**
  * Pack two delta values (a,b) into one 16bit word
- * according with endianess of the host machine.
+ * according with endianness of the host machine.
  */
 #if HAVE_BIGENDIAN
 #define PD(a,b) (((a) << 8) + (b))
@@ -245,8 +247,8 @@
  * Expand a pair of delta values (a,b)
  * into two/four delta entries.
  */
-#define E2(a, b) PD(a, b), PD(-a, -b)
-#define E4(a, b) PD(a, b), PD(-a, -b), PD(b, a), PD(-b, -a)
+#define E2(a, b) PD(a, b), PD(-(a), -(b))
+#define E4(a, b) PD(a, b), PD(-(a), -(b)), PD(b, a), PD(-(b), -(a))
 
 /*
  * VQ tables for 4x4 block modes.
@@ -280,7 +282,7 @@ static const int16_t delta_tab_3_5[79]  = { TAB_3_5 };
 
 /**
  * Pack four delta values (a,a,b,b) into one 32bit word
- * according with endianess of the host machine.
+ * according with endianness of the host machine.
  */
 #if HAVE_BIGENDIAN
 #define PD(a,b) (((a) << 24) + ((a) << 16) + ((b) << 8) + (b))
@@ -318,7 +320,7 @@ static const int32_t delta_tab_3_4_m10[79]  = { TAB_3_4 };
 static const int32_t delta_tab_3_5_m10[79]  = { TAB_3_5 };
 
 
-typedef struct {
+typedef struct vqEntry {
     const int16_t  *deltas;     ///< delta tables for 4x4 block modes
     const int32_t  *deltas_m10; ///< delta tables for 8x8 block modes
     uint8_t        num_dyads;   ///< number of two-pixel deltas