1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-21 15:27:00 +00:00
Commit Graph

77 Commits

Author SHA1 Message Date
wm4
24be34f1e9 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.
2012-03-01 00:22:30 +02:00
reimar
7c87946c69 loader: Remove __ptr32 and __ptr64 typedefs
We do not need them and they cause compilation errors with cygwin's
mingw-w64 cross-compilers (32 bit target) since its _mingw.h has a
"#define __ptr32", which makes these typedefs an invalid syntax.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32728 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-29 04:05:28 +02:00
cehoyos
aaba0aea70 Silence a gcc warning about char trying to be packed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31172 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-13 20:48:55 +00:00
diego
275efd21b1 Mark parameterless function declarations as (void). Fixes the warnings:
loader/wine/msacm.h:693: warning: function declaration isn't a prototype
loader/wine/msacm.h:901: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31003 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:21:07 +00:00
diego
983b920137 loader: Remove commented-out extra_ld_library_path cruft.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30953 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 20:24:14 +00:00
diego
289697dc50 Add public function VideoForWindowsVersion() to the appropriate header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30693 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 23:33:03 +00:00
diego
8ba6b4eaf9 cosmetics: Remove pointless empty lines at EOF.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:02:49 +00:00
diego
4b6ce33628 Directly mark structs as WINE_PACKED where all members are marked as packed.
This fixes a ton of gcc warnings about ignored packed attributes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30581 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 14:49:44 +00:00
diego
03721390a4 Remove pointless egcs #ifdefs; that compiler was never supported.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30539 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-11 22:54:34 +00:00
diego
0a3901e1ae Remove extern "C" declarations from loader code.
Our loader code is not a general-purpose library and not used from C++.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30538 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-11 14:33:57 +00:00
reimar
06c2afa750 Use ARCH_X86_32 instead of the compiler-specific __i386__
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30294 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-12 20:26:15 +00:00
diego
dec1227f1c Add required header #includes to satisfy 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30213 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 20:36:27 +00:00
reimar
12760fc513 Several hacks to fix compilation of tvi_dshow on MinGW64.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 17:41:11 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
diego
26b29f4f2d Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:17:56 +00:00
diego
6b52a2e974 Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:59:27 +00:00
diego
bc0058c63e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:31:55 +00:00
diego
a27f73390f Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26141 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-02 19:38:50 +00:00
diego
80104b1757 Fix illegal identifiers starting with _ and capital letters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:48:29 +00:00
diego
bb7b132e08 Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26077 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-23 14:50:55 +00:00
diego
afb46fd9f4 Remove misplaced #endif comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26056 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 22:28:58 +00:00
diego
1c12fd33d0 Get rid of redundant dbg_printf redefinition. Fixes some warnings:
wine/debugtools.h:57: warning: useless type name in empty declaration


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25898 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 08:48:16 +00:00
reimar
2da6e47a62 Remove $Id$ tags, they make diffs between different versions
harder to read than necessary.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25877 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 12:15:27 +00:00
diego
f6031d6305 Remove unused DPRINTF__ macro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25831 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 11:11:32 +00:00
diego
3bbe897e24 Fix a ton of illegal identifiers. Identifiers starting with __ or _ and a
capital letter are reserved for the system, those starting with _ are
reserved at the file level.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25822 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 17:16:39 +00:00
diego
6b64884159 Consistently use just the name of the #ifdef directive in preprocessor comments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25576 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:07:21 +00:00
diego
fba0b66ff9 Add explanatory comments to the #endif part of multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-31 16:15:50 +00:00
compn
dac13715ce add comment to endif
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24806 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-18 12:43:57 +00:00
compn
c040ef5660 Add Coinitialize function to vfw encoder and win32 loader.
Fixes crash when trying to load vp7vfw.dll in vfw2menc.
Patch by Gianluigi Tiesi mplayer___netfarm.it
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-September/054136.html



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24798 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-17 05:14:21 +00:00
diego
52a20f8579 Remove leading underscores from multiple inclusion guards,
leading underscores are reserved in the C standard.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24442 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 08:50:21 +00:00
diego
a94ff0adc4 Fix include path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24441 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 00:17:52 +00:00
diego
a485b5d748 Remove redundant #ifndef, __WINE_MMSYSTEM_H is never defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24440 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 23:42:30 +00:00
diego
c374720467 Remove useless #ifndef, __WINE_WINGDI_H is never defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24438 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 23:14:55 +00:00
diego
254f0f1028 Remove redundant multiple inclusion guard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24437 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 23:13:53 +00:00
diego
802b125c30 Consistently use path as multiple inclusion guard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24433 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 15:30:22 +00:00
voroshil
78c2694b48 Revert r24424.
Fix is wrong, because 'packed' attribute can be placed before
structure definition only when all members have this attribute.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24426 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 18:55:52 +00:00
voroshil
169a837b18 Fix for a lot of
"'packed' attribute ignored for field of type 'BYTE'" warnings.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24424 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 18:07:25 +00:00
diego
36a28b6f50 cosmetics: Add comments to some #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24422 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 16:17:13 +00:00
diego
efb42f1aaa Get rid of superfluous __WINE__ #define, it was always enabled and
cluttered the code. Blessed by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23448 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 12:27:33 +00:00
nplourde
fc59977ac9 fix compilation for win32 dll codec support for intel osx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21306 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 02:44:06 +00:00
diego
57f3213401 CVS --> Subversion in copyright notices
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18786 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-22 13:34:00 +00:00
reimar
a669b97dd2 Several minor fixes: Correctly advertise SSE and SSE2 instruction sets,
add MSVCRT._winver and KERNEL32.GetThreadPriority exports.
Should fix some crashes esp. with wmv9dmo.dll


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16633 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-02 14:26:42 +00:00
ivo
452c2ba5da Remove stray MSDOS linebreaks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16195 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-10 22:48:32 +00:00
faust3
869decabf8 mingw and maybe other system define the __int* types to char, short..., so the typedefs become typedef char char; etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15692 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-07 13:54:17 +00:00
diego
f5e88339a5 Mark modified imported files as such to comply with GPL §2a.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15167 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-15 20:17:14 +00:00
diego
c2a4be43c7 icc support by Darek Ostolski <ostolski at kwantum dot gda dot pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14493 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-14 00:14:45 +00:00
rathann
644c09f266 loader gcc warning fixes and avifile sync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13183 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-28 20:22:38 +00:00
wight
2e45172c98 Better protection against double definition of MPEGLAYER3WAVEFORMAT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12980 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-09 15:53:10 +00:00
rfelker
92aa4728d6 minimal fix for alex's 1000000000000l compile errors. imo the fix in
aviheader.h is totally correct. defining useless typedefs that can
conflict with other headers is bad practice. i don't like editing
mmreg.h but oh well... if you have a better fix, commit it! finally,
the fix in the ad_ and vd_ files seems totally correct.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12357 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 10:26:26 +00:00