[vlc-commits] demux: avi: fix double define

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Aug  4 13:21:12 2020 +0200| [8a08f1f7dc12d2c73a204b9bef2d7c76ae604555] | committer: Francois Cartegnie

demux: avi: fix double define

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

 modules/demux/avi/bitmapinfoheader.h | 13 +++++++++----
 modules/demux/avi/libavi.h           | 11 -----------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/modules/demux/avi/bitmapinfoheader.h b/modules/demux/avi/bitmapinfoheader.h
index 3208a38d7b..30a653243a 100644
--- a/modules/demux/avi/bitmapinfoheader.h
+++ b/modules/demux/avi/bitmapinfoheader.h
@@ -26,10 +26,15 @@
 #include <limits.h>
 
 /* biCompression / Others are FourCC */
-#define BI_RGB              0x0000
-#define BI_RLE8             0x0001
-#define BI_RLE4             0x0002
-#define BI_BITFIELDS        0x0003
+#ifndef BI_RGB
+ #define BI_RGB             0x0000
+ #define BI_RLE8            0x0001
+ #define BI_RLE4            0x0002
+ #define BI_BITFIELDS       0x0003
+ #define BI_JPEG            0x0004
+ #define BI_PNG             0x0005
+#endif
+#define BI_ALPHAFIELDS      0x0006
 #define BI_CMYK             0x000B
 #define BI_CMYKRLE8         0x000C
 #define BI_CMYKRLE4         0x000D
diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index 731fb2c1c7..7aa4997978 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -19,17 +19,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/* 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? */
 #define AVIF_MUSTUSEINDEX   0x00000020