Commit Graph

135 Commits

Author SHA1 Message Date
diego 4b34771463 Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can
conflict with the header by the same name in loader/wine/driver.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 10:43:30 +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 0792780cb7 Use consistent #include paths without "../".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:50:24 +00:00
diego a001647301 Remove obsolete and non-working test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26558 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:52:56 +00:00
diego 7a5924159c Replace __MINGW32__ preprocessor check with proper HAVE_SYS_MMAN_H check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26136 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:16:43 +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
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 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 fd3d8e7b3c Add missing #include, fixes the warning:
dshow/mediatype.c:89: warning: implicit declaration of function 'vo_format_name'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25803 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 15:20:18 +00:00
diego fc6f2b51e3 Use ld conversion specifier for long int argument, fixes the warning:
dshow/outputpin.c:754: warning: format '%d' expects type 'int', but argument 3 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25802 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 15:08:01 +00:00
reimar 47cbaf4c81 Remove another 2 useless casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25710 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 10:19:06 +00:00
reimar a20fa53d69 Get rid of another useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25709 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 10:09:39 +00:00
reimar e356da9b2f Remove a cast useless since r24425.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25708 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 10:01:27 +00:00
reimar 56aea56fc0 Move variable declaration into block where it is used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25707 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 09:39:28 +00:00
reimar 2d3538e538 Remove result from warning string, it has no useful meaning here.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25706 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 09:38:39 +00:00
reimar a66f248c25 Remove a useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25705 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 09:37:36 +00:00
diego c6fadb653d Fix warnings:
dshow/test.c:52: warning: implicit declaration of function 'strcpy'
dshow/test.c:52: warning: incompatible implicit declaration of built-in function 'strcpy'
dshow/test.c:61: warning: implicit declaration of function 'memset'
dshow/test.c:61: warning: incompatible implicit declaration of built-in function 'memset'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25612 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:20:34 +00:00
diego bf1ff2620f Add missing #includes to fix compilation:
dshow/test.c:11: error: 'BITMAPINFOHEADER' undeclared (first use in this function)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25611 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-06 11:19:48 +00:00
diego 60fa2be5d7 consistency cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 20:05: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
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
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 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
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
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 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
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
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 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
voroshil e9e53f8cd0 Rework of copying samples from directshow codecs.
Using callback function provided by filter to store and process samples from
codec instead of explicit typecast to DS_Filter.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22416 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-02 18:52:10 +00:00
voroshil ecd2116704 Fix wrong typecast, which can cause MPlayer crash
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22352 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-26 17:21:17 +00:00
voroshil 09d15d04c2 Fix loading of mpeg4ds direct show video codec under win32, broken in r22322
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22325 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 16:30:10 +00:00
voroshil fe35a2d081 Free AM_MEDIA_TYPE structure content when CEnumMediaTypes object is destroyed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22324 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 10:59:54 +00:00
voroshil a98fcdb7b3 Moving duplicated (and sometimes wrong) AM_MEDIA_TYPE related code into separate file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22323 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 09:58:01 +00:00
voroshil e33a1695ba Fixed loading of VoxWare and wma9sp binary audio codecs using dshow engine.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22322 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-23 08:07:07 +00:00
rtogni 656c22ca16 Precent overflow of this->m_sVhdr->bmiHeader buffer, may have been
exploitable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22205 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-11 17:57:02 +00:00
voroshil 99c144b6de Doxygen comments for used DirectShow methods.
Info was got from DirectShow SDK.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22046 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 16:53:33 +00:00
voroshil 91629bc111 fix overlooked debug message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22035 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 17:01:54 +00:00
voroshil f722b60a29 Changing debug messages and renaming method names according to their
implementations.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22034 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 16:41:01 +00:00
voroshil e83175521f fix typos from previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22033 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 16:28:16 +00:00
voroshil 3cf9c58559 Cosmetics. Doxygen comments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22032 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-27 15:49:53 +00:00
gpoirier b74e51f49c Remove illegal definition of underscored-prefixed symbol "__MODULE__":
All underscored-prefixed symbols have the right re-defined by the compiler, so it's definitely not safe to use any.
ICC doesn't seem to like it, GCC doesn't seem to care.
Original thread:
date: Jan 25, 2007 2:41 PM
subject: [MPlayer-dev-eng] [PATCH] remove illegal underscored-prefixed symbols
AND
date: 01/25/2007 11:43 AM
subject: Re: [MPlayer-dev-eng] [PATCH] compiling with Intel C


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22019 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-26 09:21:22 +00:00
diego 58a9204e79 Make loader Makefile non-recursive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21201 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 00:31:07 +00:00