[x264-devel] Re: x264: svn commit r520 (pengvado)

[Andrea Barbieri]

Hello,

common/macroblock.h makes use C99 designated initializers which are not 
supported at the moment by any Visual C++ compilers...

I've attached a patch that provides support for successful compilation 
in MSVC projects.

best regards,
andrea
-- 
Andrea Barbieri
KeyID=0x034DFD5A
KeyFingerprint=C1 68 EA 9A 71 89 53 8D  21 4F 12 81 A7 52 9F 32  03 4D FD 5A
Moving Image Research, The Workshop, Hampton Lane, Bristol, BS6 6LE, UK
Tel +44 117 9732200, FAX +44 117 9732210
http://www.movingimageresearch.com/
-------------- next part --------------
Index: macroblock.h

===================================================================

--- macroblock.h	(revision 520)

+++ macroblock.h	(working copy)

@@ -38,6 +38,7 @@

 
 static const int x264_pred_i4x4_neighbors[13] =
 {
+#ifndef _MSC_VER
     [I_PRED_4x4_HU]      = MB_LEFT,
     [I_PRED_4x4_H]       = MB_LEFT,
     [I_PRED_4x4_HD]      = MB_LEFT | MB_TOPLEFT | MB_TOP,
@@ -50,6 +51,21 @@

     [I_PRED_4x4_DC_LEFT] = MB_LEFT,
     [I_PRED_4x4_DC_TOP]  = MB_TOP,
     [I_PRED_4x4_DC_128]  = 0
+#else
+    MB_TOP,                         // I_PRED_4x4_V
+    MB_LEFT,                        // I_PRED_4x4_H
+    MB_LEFT | MB_TOP,               // I_PRED_4x4_DC
+    MB_TOP  | MB_TOPRIGHT,          // I_PRED_4x4_DDL
+    MB_LEFT | MB_TOPLEFT | MB_TOP,  // I_PRED_4x4_DDR
+    MB_LEFT | MB_TOPLEFT | MB_TOP,  // I_PRED_4x4_VR
+    MB_LEFT | MB_TOPLEFT | MB_TOP,  // I_PRED_4x4_HD
+    MB_TOP  | MB_TOPRIGHT,          // I_PRED_4x4_VL
+    MB_LEFT,                        // I_PRED_4x4_HU
+    MB_LEFT,                        // I_PRED_4x4_DC_LEFT
+    MB_TOP,                         // I_PRED_4x4_DC_TOP
+    0,                              // I_PRED_4x4_DC_128
+    0
+#endif
 };