1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 04:45:33 +00:00
Commit Graph

416 Commits

Author SHA1 Message Date
diego
60eaa3a7da Detect support of and add necessary CFLAGS to avoid crashes when loading
Win32 DLLs on Mac OS X / Intel.
based on patch by Ulion, ulion2002 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24683 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-01 22:46:33 +00:00
voroshil
4357e135eb Move AM_MEDIA_TYPE structure definition to mediatype.h.
Make inclusion of com.h and wine/*.h conditional,
this will allow reusing of mediatype.c code under MinGW
without requirement to include all remaining wine/* stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24448 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 16:13:37 +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
d81a386693 cosmetics: Use uppercase for multiple inclusion guards and comment #endifs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24439 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 23:16:39 +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
cehoyos
e0b3031d97 Fix indentation after r24367.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24428 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 23:14:17 +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
903cbd2fc7 Fix for:
dshow/DS_Filter.c: In function 'DS_Filter_CopySample':
dshow/DS_Filter.c:103: warning: dereferencing type-punned pointer will break strict-aliasing rules
dshow/DS_Filter.c:185: warning: dereferencing type-punned pointer will break strict-aliasing rules
dshow/DS_Filter.c:191: warning: dereferencing type-punned pointer will break strict-aliasing rules
dshow/DS_Filter.c:198: warning: dereferencing type-punned pointer will break strict-aliasing rules
dshow/DS_Filter.c:220: warning: dereferencing type-punned pointer will break strict-aliasing rules
dshow/DS_Filter.c:245: warning: dereferencing type-punned pointer will break strict-aliasing rules
dmo/dmo.c: In function 'DMO_FilterCreate':
dmo/dmo.c:73: warning: dereferencing type-punned pointer will break strict-aliasing rules
dmo/dmo.c:79: warning: dereferencing type-punned pointer will break strict-aliasing rules
dmo/dmo.c:86: warning: dereferencing type-punned pointer will break strict-aliasing rules
dmo/dmo.c:90: warning: dereferencing type-punned pointer will break strict-aliasing rules
dmo/dmo.c:93: warning: dereferencing type-punned pointer will break strict-aliasing rules


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24425 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 18:27:45 +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
9489e9dd4b warning fixes:
win32.c:2102: warning: redundant redeclaration of 'LoadResource'
wine/winbase.h:1678: warning: previous declaration of 'LoadResource' was here
win32.c:2247: warning: redundant redeclaration of 'MODULE32_LookupHMODULE'
wine/module.h:143: warning: previous declaration of 'MODULE32_LookupHMODULE' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24421 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 15:38:11 +00:00
diego
183b4d6fea warning fix:
win32.c: In function 'expGetSystemInfo':
win32.c:935: warning: unused variable 'regs'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24420 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 15:33:40 +00:00
diego
bedf84a5e0 warning fix:
win32.c:960: warning: redundant redeclaration of 'gCpuCaps'
../cpudetect.h:53: warning: previous declaration of 'gCpuCaps' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24419 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 15:32:11 +00:00
diego
bbe0b8ce6d warning fixes:
pe_image.c:70: warning: redundant redeclaration of 'LookupExternal'
win32.h:41: warning: previous declaration of 'LookupExternal' was here
pe_image.c:71: warning: redundant redeclaration of 'LookupExternalByName'
win32.h:42: warning: previous declaration of 'LookupExternalByName' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24418 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 15:27:23 +00:00
voroshil
abb5ffc65d Fix for:
dshow/mediatype.c:37: warning: suggest explicit braces to avoid ambiguous 'else'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24417 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 14:43:19 +00:00
voroshil
a08444432e Fix for:
dshow/mediatype.c:47: warning: format '%02d' expects type 'int', but argument 5 has type 'long unsigned int'
dshow/mediatype.c:74: warning: format '%d' expects type 'int', but argument 4 has type 'DWORD'
dshow/mediatype.c:77: warning: format '%d' expects type 'int', but argument 4 has type 'DWORD'
dshow/mediatype.c:84: warning: format '%d' expects type 'int', but argument 4 has type 'long int'
dshow/mediatype.c:85: warning: format '%d' expects type 'int', but argument 4 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24416 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 14:29:44 +00:00
voroshil
8228670a2e Proper fix for:
dshow/mediatype.c:52: warning: implicit declaration of function 'printf'
dshow/mediatype.c:52: warning: incompatible implicit declaration of built-in function 'printf'
    

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24415 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:50:03 +00:00
diego
4b3a9ce83e cosmetics: Fix silly typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24414 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:30:22 +00:00
diego
0c4d465c19 warning fix:
dmo/dmo.c:118: warning: unused variable 'vi'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24413 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:29:14 +00:00
diego
a6bf35473f warning fixes:
dmo/DMO_VideoDecoder.c: In function 'DMO_VideoDecoder_DecodeInternal':
dmo/DMO_VideoDecoder.c:299: warning: unused variable 'ptr'
dmo/DMO_VideoDecoder.c: In function 'DMO_VideoDecoder_SetDestFmt':
dmo/DMO_VideoDecoder.c:366: warning: unused variable 'stoped'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24412 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:28:00 +00:00
diego
c85832df25 warning fix:
dshow/mediatype.c:46: warning: implicit declaration of function 'printf'
dshow/mediatype.c:46: warning: incompatible implicit declaration of built-in function 'printf'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24411 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:19:46 +00:00
diego
385c68cdee warning fixes:
dshow/DS_VideoDecoder.c: In function 'DS_VideoDecoder_StartInternal':
dshow/DS_VideoDecoder.c:268: warning: unused variable 'props1'
dshow/DS_VideoDecoder.c:268: warning: unused variable 'props'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24410 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:17:29 +00:00
diego
517a64c42e warning fixes:
dshow/DS_AudioDecoder.c: In function 'DS_AudioDecoder_Open':
dshow/DS_AudioDecoder.c:98: warning: unused variable 'props1'
dshow/DS_AudioDecoder.c:98: warning: unused variable 'props'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24409 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:16:44 +00:00
diego
0865edbc5d warning fixes:
elfdll.c: In function 'ELFDLL_CreateModref':
elfdll.c:177: warning: unused variable 'len'
elfdll.c:175: warning: unused variable 'pe_import'
elfdll.c:174: warning: unused variable 'dir'
elfdll.c: In function 'ELFDLL_LoadLibraryExA':
elfdll.c:244: warning: unused variable 'image'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24408 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:10:44 +00:00
diego
3f522888be warning fixes:
registry.c: In function 'insert_reg_value':
registry.c:266: warning: unused variable 't'
registry.c: In function 'RegSetValueExA':
registry.c:491: warning: unused variable 't'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24407 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:08:46 +00:00
diego
ca743e59fd warning fixes:
resource.c: In function 'RES_SizeofResource':
resource.c:111: warning: unused variable 'hRsrc32'
resource.c: In function 'RES_LoadResource':
resource.c:157: warning: unused variable 'hRsrc32'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24406 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:06:54 +00:00
diego
5277e4f075 warning fixes:
win32.c: In function 'expCreateSemaphoreA':
win32.c:1751: warning: unused variable 'pp'
win32.c: In function 'expGetStartupInfoA':
win32.c:2187: warning: unused variable 'i'
win32.c: In function 'expLoadLibraryA':
win32.c:2298: warning: unused variable 'i'
win32.c: In function 'expWritePrivateProfileStringA':
win32.c:2786: warning: unused variable 'size'
win32.c: In function 'expGetSystemTimeAsFileTime':
win32.c:3136: warning: unused variable 'local_tm'
win32.c: In function 'expGetEnvironmentVariableA':
win32.c:3150: warning: unused variable 'p'
win32.c: In function 'LookupExternalByName':
win32.c:5371: warning: unused variable 'answ'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24405 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 13:03:20 +00:00
diego
286467904a warning fix:
ext.c: At top level:
ext.c:316: warning: 'mapping_size' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24404 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 12:54:32 +00:00
diego
f3cb7097cf warning fixes:
ext.c: In function 'HeapAlloc':
ext.c:86: warning: unused variable 'i'
ext.c: In function 'VirtualAlloc':
ext.c:440: warning: unused variable 'fd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24403 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 12:51:26 +00:00
diego
ffe4478efe warning fixes:
module.c: In function 'MODULE_DllProcessAttach':
module.c:217: warning: unused variable 'i'
module.c: In function 'MODULE_DllProcessDetach':
module.c:278: warning: unused variable 'l'
module.c: In function 'MODULE_LoadLibraryExA':
module.c:305: warning: unused variable 'i'
module.c: In function 'report_func_ret':
module.c:948: warning: unused variable 'i'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24402 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 11:41:26 +00:00
diego
f45eb00c5d warning fixes:
pe_image.c: In function 'fixup_imports':
pe_image.c:290: warning: unused variable 'wmImp'
pe_image.c: In function 'PE_LoadImage':
pe_image.c:445: warning: unused variable 'bhfi'
pe_image.c: In function 'PE_CreateModule':
pe_image.c:706: warning: unused variable 'result'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24401 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 11:34:58 +00:00
diego
284037012e warning fixes:
afl.c: In function 'acmDriverOpen':
afl.c:196: warning: unused variable 'hdrv'
afl.c: In function 'acmStreamOpen':
afl.c:441: warning: unused variable 'drv_tag'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24400 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 11:31:51 +00:00
diego
9ac38fa4c6 warning fix:
driver.c: In function 'DrvOpen':
driver.c:152: warning: unused variable 'i'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 11:28:55 +00:00
voroshil
cf5ef1660a Avoid releasing of unallocated memory.
Patch is made from coreavc-for-linux project source code
http://code.google.com/p/coreavc-for-linux/



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24367 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-08 12:15:15 +00:00
voroshil
72d755e7dd Always initialize pUnk pointer with zero.
Should fix accidental crashes in various dshow/vfm binary codecs,
caused by attempting to release unallocated data.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24363 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-08 06:01:43 +00:00
diego
ea66106b4c Revert last commit, -mstackrealign was added in gcc 4.2 and should not
be used unconditionally.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24221 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 09:12:35 +00:00
diego
835443cdfe Add -mstackrealign to CFLAGS on Darwin, fixes loading WMV9 DLL.
patch by Ulion, ulion2002 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24142 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-24 12:49:59 +00:00
reimar
49987047a3 Ugly hack to make xanlib.dll work.
See also http://samples.mplayerhq.hu/game-formats/wc4-xan/


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23981 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-01 03:30:38 +00:00
diego
b000a6a519 ISO8859-1 --> UTF-8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23754 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 19:50:36 +00:00
voroshil
ccbdda2c66 Add regular #define for header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23513 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-08 12:18:44 +00:00
diego
4767b92545 10l: Remove overlooked instance of NOAVIFILE_HEADERS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23450 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 14:38:45 +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
diego
4f88dffa13 Get rid of superfluous NOAVIFILE_HEADERS #define, it was always enabled and
cluttered the code. Blessed by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23447 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 12:26:27 +00:00
diego
09ea65448e Get rid of superfluous MPLAYER #define, it was always enabled and
cluttered the code. Blessed by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23446 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 12:24:35 +00:00
diego
e1120b099e typo fixes ported from VLC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22893 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 14:42:13 +00:00
nicodvb
a09d3e1bc7 check that definition of prototype of sysi86(int, void*) doesn't conflict; fixed compilation in opensolaris
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22733 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-18 22:18:11 +00:00