diff options
author | wm4 <wm4@mplayer2.org> | 2012-02-27 19:15:13 +0100 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2012-03-01 00:22:30 +0200 |
commit | 24be34f1e9e37111a06108c090324426aff6f1db (patch) | |
tree | aa28674a6d69dfb18fd102608f72e3081df6d1dd /libmpdemux | |
parent | 25417a626d0b9077bfbb940952f3858d7b8b549b (diff) | |
download | mpv-24be34f1e9e37111a06108c090324426aff6f1db.tar.bz2 mpv-24be34f1e9e37111a06108c090324426aff6f1db.tar.xz |
cleanup: Silence compilation warnings on MinGW-w64
Some of the code, especially the dshow and windows codec loader parts,
are extremely hacky and likely full of bugs. The goal is merely getting
rid of warnings that could obscure more important warnings and actual
bugs, instead of fixing actual problems. This reduces the number of
warnings from over 500 to almost the same as when compiling on Linux.
Note that many problems stem from using the ancient wine-derived
windows headers. There are some differences to the "proper" windows
header. Changing the code to compile with the proper headers would be
too much trouble, and it still has to work on Unix.
Some of the changes might actually break compilation on legacy MinGW,
but we don't support that anymore. Always use MinGW-w64, even when
compiling to 32 bit.
Fixes some warnings in the win32 loader code on Linux too.
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/aviheader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 6c86378a4a..8d226606de 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -128,8 +128,10 @@ typedef struct { #define AVIIF_NOTIME 0x00000100L // this frame doesn't take any time #define AVIIF_COMPUSE 0x0FFF0000L // these bits are for compressor use +#ifndef FOURCC_RIFF #define FOURCC_RIFF mmioFOURCC('R', 'I', 'F', 'F') #define FOURCC_LIST mmioFOURCC('L', 'I', 'S', 'T') +#endif typedef struct { |