[vlc-commits] demux: avi: remove enum/fix build

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Nov 23 09:52:59 2017 +0100| [7ba9558c2e33654ac14aa5fa71429f98e045e44b] | committer: Francois Cartegnie

demux: avi: remove enum/fix build

move as defines,  we can't change member type

This reverts commit 5640f9814c4ed2edb9b33086f3465837e1fc4adc.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ba9558c2e33654ac14aa5fa71429f98e045e44b
---

 modules/demux/avi/libavi.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index e1c283bc01..26e1614a12 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -20,18 +20,16 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-enum biCompression
-{
-    BI_RGB = 0x00,
-    BI_RLE8,
-    BI_RLE4,
-    BI_BITFIELDS,
-    BI_JPEG,
-    BI_PNG,
-    BI_CMYK = 0x0B,
-    BI_CMYKRLE8,
-    BI_CMYKRLE4
-};
+/* biCompression / Others are FourCC */
+#define BI_RGB              0x0000
+#define BI_RLE8             0x0001
+#define BI_RLE4             0x0002
+#define BI_BITFIELDS        0x0003
+#define BI_JPEG             0x0004
+#define BI_PNG              0x0005
+#define BI_CMYK             0x000B
+#define BI_CMYKRLE8         0x000C
+#define BI_CMYKRLE4         0x000D
 
 /* flags for use in <dwFlags> in AVIFileHdr */
 #define AVIF_HASINDEX       0x00000010  /* Index at end of file? */