Commit Graph

24432 Commits

Author SHA1 Message Date
reimar 62e3a9e6a6 Deobfuscate: use IMGFMT_RGB_DEPTH and IMGFMT_IS_BGR
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24451 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 18:36:04 +00:00
voroshil 7d44f8c906 Fix missing reset/initialization (with tv parameters) of
vbi subsystem after tv initialization.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24450 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 17:13:27 +00:00
ben 6474da1414 added monkey audio file extensions to extension table
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24449 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 17:06:36 +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
reimar 429b15b71b Check wLongsPerEntry before using it.
This fixes a potential crash for some values of it.
As a side effect it works around broken callocs with an integer
overflow vulnerability, but using MPlayer on such systems should
never be assumed to be safe!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24447 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 15:18:57 +00:00
diego 5f9fbb7124 Remove useless preprocessor check, _WINGDI_H is never defined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24446 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 14:12:06 +00:00
uau b54169f071 Add support for FFmpeg Monkey's Audio decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24445 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 13:47:22 +00:00
diego 43bd3a468e warning fixes:
input.c: In function 'mp_input_set_section':
input.c:1640: warning: suggest parentheses around assignment used as truth value
input.c:1643: warning: suggest parentheses around assignment used as truth value
mga_common.c: In function 'mga_init':
mga_common.c:394: warning: suggest parentheses around assignment used as truth value
playtreeparser.c: In function 'parse_smil':
playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'ts_parse':
libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value
libmpdemux/demux_ts.c: In function 'demux_open_ts':
libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 13:16:30 +00:00
reimar 26bee6f728 Replace constant by appropriate define
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24443 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-13 11:23:32 +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
reimar aef93d245d DOCS/tech/colorspaces.txt says I420 and IYUV are the same, so add IYUV at the
same place. It can't break anything worse than it is now (i.e. not working/supported
at all) and hopefully triggers a bug report so it gets fixed if it's wrong ;-)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24436 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 17:59:31 +00:00
voroshil aa86532434 r24423: Implementation of tv:// driver autodetection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24435 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 17:57:40 +00:00
voroshil f7982b0b4d r24423: Implementation of tv:// driver autodetection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24434 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 17:53:41 +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
Gabrov 01e19430f5 synced with r24423
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24432 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 14:54:08 +00:00
diego 177e5c452a Add missing #include to fix compilation.
patch by Bernd Ernesti, mplayer-dev-eng lists.veego de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24431 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 08:49:25 +00:00
reimar f087be10ae Do not replace _ by - if x86_64 is given in --target.
Patch by Andrew Calkin (andrew calkin gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24430 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-12 06:59:36 +00:00
gpoirier 1878e0384b sync w/r24423
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24429 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-11 11:41:10 +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
kraymer 44b2e1594f r24294: suboption consistency, add fixme document -vivo suboptions
r24310: Support for selecting language via packet 28.
r24329: manpage fix: escape '\' in -vf geq description
r24349: Support lowdelay flag
r24356: spelling fixes, pointed by Diego
r24357: Clarify teletext tlang option.
r24386: move lavc option out of XviD section, to lavc section
r24423: Implementation of tv:// driver autodetection.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24427 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 23:09:19 +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
voroshil dcc2e2e5ea Implementation of tv:// driver autodetection.
If user did not specify driver directly, all available
drivers will be probed (in order: v4l2,v4l1,bsdbt848,dummy).
In most cases first probed driver will be successfully autodetected
and used.
Autodetection will be disabled if user specified driver directly (in
command line or config).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24423 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 17:09:35 +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