RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
31,212 Commits 41 Branches 85 Tags 138 MiB
Commit Graph

593 Commits

Author SHA1 Message Date
Uoti Urpala 0dce155dd3 Merge svn changes up to r30694 2010-03-10 01:01:15 +02:00
Uoti Urpala 90f5873f1a Merge svn changes up to r30675 2010-03-10 00:47:25 +02:00
Uoti Urpala 13221a7165 Merge svn changes up to r30663 
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
 2010-03-10 00:13:11 +02:00
Uoti Urpala c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala 42bf12c2d3 Merge svn changes up to r30595 
Conflicts:
	mplayer.c
	vidix/nvidia_vid.c
 2010-03-09 23:37:00 +02:00
Uoti Urpala 36e7a20e69 Merge svn changes up to r30550 2010-03-09 23:03:14 +02:00
Uoti Urpala 8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala 173beb5608 Merge svn changes up to r30514 2010-03-09 19:58:02 +02:00
Uoti Urpala 5c6795a687 Merge svn changes up to r30494 
Conflicts:
	libvo/vo_gl.c
	libvo/x11_common.c
 2010-03-09 19:34:30 +02:00
Uoti Urpala 5234c72e28 Restore collapsed whitespace in output messages 
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
 2010-03-07 21:34:54 +02: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 4d6d266521 Only #define WIN32_LOADER if it has not been #defined already, fixes warning: 
loader/win32.c:27:1: warning: "WIN32_LOADER" redefined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30689 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 22:14:11 +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 d306b727b1 Remove pointless '#if 1' preprocessor directives. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30654 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 10:22:29 +00:00
reimar 134bbb8cd8 Add a InitializeCriticalSectionAndSpinCount function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30640 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-18 20:24:52 +00:00
reimar 87edb382c6 Add a GetModuleHandleW implementation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30639 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-18 20:23:05 +00:00
reimar 2903a8583f Use snprintf to ensure we do not write outside the buffer bounds 
when recording stub names into export_names.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30638 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-18 20:20:23 +00:00
diego 39ce4dd088 Add header #include for print_wave_header() instead of a forward declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-18 10:26:39 +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 f34f239cce Explain WIN32_LOADER definition hack. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30545 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-12 14:25:25 +00:00
diego 5b01485ea3 Get rid of pointless CONFIG_QTX_CODECS --> QTX preprocessor indirection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30544 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-12 14:10:21 +00:00
diego c53143fffb Fix linking of loader test programs when loader is disabled. 
Dependencies were only set correctly if the loader code was enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30542 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-12 13:45:19 +00:00
komh 47f78d28f1 Add win32 loader support for OS/2 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30541 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-12 01:38:14 +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 77e66ee012 Add stubs for several functions, needed for CineForm codec. 
Patch by Steinar H. Gunderson [sgunderson bigfoot com]
with some modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30531 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-09 19:43:02 +00:00
diego edf4053b98 Remove disabled AVIFILE-specific preprocessor code. 
It will never get enabled in MPlayer, nor is it more than cruft.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30526 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-08 10:14:42 +00:00
diego 79641e6232 Merge some preprocessor conditionals where appropriate. 
This saves a few lines and simplifies the code slightly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30525 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-08 10:05:49 +00:00
reimar 847aa91f43 Release pin enumerator after we are done using it. 
Fixes issues with CoreAVC tray icon.
Patch by Gianluigi Tiesi [mplayer netfarm it]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30516 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-05 17:20:21 +00:00
komh 2762207eed Prefix EXTERN_ASM to global variables to match them to an extern prefix of C. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30512 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-05 11:00:59 +00:00
komh 788b356377 Remove '.section' causing the following assembler error on OS/2. 
Error: unknown pseudo-op: `.section'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30511 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-05 10:54:28 +00:00
diego d7a1d12f61 Add missing license headers to test programs for external libraries. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30494 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 08:32:35 +00:00
Uoti Urpala 4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala ff2df2ac54 Merge svn changes up to r30322 2010-01-25 15:17:50 +02:00
Uoti Urpala 69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
Uoti Urpala 36dae0ee44 Merge svn changes up to r30268 2010-01-25 14:55:14 +02:00
Uoti Urpala 0f72485ee7 Merge svn changes up to r30264 
Conflicts:
	gui/wm/ws.c
 2010-01-25 14:52:29 +02:00
reimar 8afef4e19c Hack to avoid a GUID_NULL clash on 64 bit MinGW. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30348 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-17 13:28:29 +00:00
reimar ee2a738ff8 Document some of the ext_stub magic. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30320 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-16 15:04:17 +00:00
reimar e09b799ade 100l, forgot to change the "magic" value in the stub also in the place replacing it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30319 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-16 15:02:49 +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
reimar af6f08ce6a Place a volatile at a more appropriate place. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30268 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-10 19:59:36 +00:00
reimar acc53c9609 Change dummy value to fit into int. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30267 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-10 19:58:01 +00:00
reimar c65994b907 Remove return statement from function that has no return value. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30266 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-10 19:52:59 +00:00
reimar cbdb16328c Avoid excessive fflush in dbgprintf if we didn't even print anything. 
Patch by Steinar H. Gunderson [sgunderson bigfoot com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30262 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-10 15:37:14 +00:00
reimar e89c898ac1 Fix RegCloseKey to not return an error on success. 
Patch by "Steinar H. Gunderson" [sgunderson bigfoot com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30261 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-10 15:31:45 +00:00
Uoti Urpala 852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +02:00
Uoti Urpala d157b2a8ce Merge svn changes up to r30173 2010-01-08 01:17:56 +02: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
diego a4ce4a23b7 Drop -Iloader from CPPFLAGS for the loader subdirectory. 
Instead use full relative paths in #includes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-04 20:32:23 +00:00