Commit Graph

648 Commits

Author SHA1 Message Date
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
sesse a8804d4d71 Fix QuickTime emulated OSErr type.
The OSErr type on Mac OS X is int16_t, not int32_t (see
http://developer.apple.com/mac/library/documentation/QuickTime/Reference/QTRef_DataTypes/Reference/reference.html).
The upper 16 bits will typically be something random (they're entirely
undefined). Change the type so it's right; a few places tried to compensate
for this by masking out the upper bits, but a few places also missed them,
which made for unpredictable behavior.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30854 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 11:12:32 +00:00
sesse b951d42e4e Implement Win32 mutexes.
Implement Win32 mutexes; they used to just be mapped on top of events, which
is not the same thing at all.

The implementation is pretty much the obvious one, similar to the
current critical section implementation and the semaphore implementation;
a single lock count protected by a pthread mutex, and an event lockers can
sleep on to know when the mutex is available.

Also make CreateMutexA and ReleaseMutex available even if QuickTime codecs
support is not configured.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30853 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 10:13:37 +00:00
sesse 8e19e87761 Fix semaphore behavior in WaitForSingleObject.
Two simple bugfixes for semaphores in WaitForSingleObject:

First, semaphore count should be decreased on loading the semaphore, not
increased. The case for duration=0 had this wrong (duration=-1 was fine).

Second, the code for duration=-1 forgot to set the return value, so it
would always return WAIT_FAILED.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30852 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 10:07:39 +00:00
sesse 474c365479 Make Win32 mutex and thread linked lists thread safe.
loader/win32.c contains a global linked list of all existing mutexes
(whose head is called mlist), which is accessed from multiple threads,
and as such needs to be protected by a mutex. Fixed.

Same thing for the global linked list of all existing threads, whose
head is called list.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30851 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 10:05:10 +00:00
sesse fbb74e16a3 Make GetModuleHandle(NULL) return a valid pointer.
Some codecs, and more recently Microsoft's CRT library, expect GetModuleHandle(NULL)
to return a pointer to the program's PE header mapped in memory. Thus, just returning
0x0 or 0x1 won't do it anymore, so create a minimal PE header and return that.

Patch originally by Gianluigi Tiesi ( mplayer (at) netfarm (dot) it ).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30848 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:09:36 +00:00
sesse c27b99441b Partial revert of r30843.
Some extra changes snuck into my commit; they'll probably be reviewed
and committed to Subversion eventually, but were not part of the fix
for WaitForSingleObject on thread handles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30844 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 11:14:07 +00:00
sesse 61f351dc90 Support thread handles in WaitForSingleObject.
Some codecs need this for clean shutdown (as opposed to a crash); we don't 
really support timed wait since POSIX doesn't, but it doesn't seem necessary.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30843 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 11:11:47 +00:00
sesse 5fb74d581f Make emulated Win32 critical sections thread safe.
Earlier, cs->locked was accessed outside the mutex to get around
the problem that default pthread mutexes are not recursive
(ie., you cannot do a double-lock from the same thread), causing
a thread-safety problem, as both detected by Helgrind and showing
up in some multithreaded codecs.

The ideal solution here would be to simply use recursive pthread
mutexes, but there were concerns about reduced debuggability and
possibly portability. Thus, instead, rewrite the critical sections
to be a simple lock count (with owner) protected by a regular mutex.
Whenever a thread wants to enter the critical section and lock_count
is not 0, it sleeps on a special event that tells it when the
critical section is available.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30837 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:57:08 +00:00
sesse f32e92b849 Fix crashes in CreatePalette by fixing the LOGPALETTE struct.
CreatePalette had problems for me, and looking at the code it was quite
obvious why; someone had reversed the order of the two elements of the
LOGPALETTE struct, causing it to allocate and copy a bogus amount of memory.
Why on earth anybody would want to do that is beyond me; whoever did it even
left a comment, but it wasn't very helpful, as it crashed nevertheless. :-)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30832 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:31:54 +00:00
sesse c6fb73d6b1 Fix manual reset behavior of Win32 events.
Events have a “reset” member that specify if they flag is automatically                                   
set back on read/wait. However, this was populated by bManualReset, so the                                
flag was inverted and once an event was set, it would forever be counted                                  
as so. Fixed by inverting the flag.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30831 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:28:02 +00:00
sesse 84bcc5642a Fix return values of WaitForSingleObject when checking an event.
These were simply inverted compared to what they should be.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30830 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-04 15:23:52 +00:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
diego e59081d121 Remove pointless '#if 1' preprocessor directive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30702 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 13:59:32 +00:00
diego 2f6fca9481 Add declaration for exp_EH_prolog_dummy().
This avoids a warning with -Wmissing-prototypes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30701 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 13:55:00 +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 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
diego 620ab70745 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30208 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 19:04:33 +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
Uoti Urpala 287b62163e Merge svn changes up to r29912 2009-11-16 07:01:46 +02:00
reimar 7199cc3c4d Implement dummy EncodePointer/DecodePointer functions needed for e.g. lagarith.dll
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29767 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-10 09:27:22 +00:00
Uoti Urpala e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
compn 11ce51e3f0 add YAXPAX and YAPAXI exports to msvcr80
fixes kegavideo binary codec
patch by Roberto Togni


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29682 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-16 12:14:17 +00:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03: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
Uoti Urpala 1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego d9ded9284c Add missing 'void' to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 17:35:26 +00:00
Uoti Urpala d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
diego 2e903f7c75 Remove unnecessary malloc.h #includes and related #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 09:20:48 +00:00
Uoti Urpala cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
compn 2a1c8c471e enable vp6 codec to read/write .fpf (passlogfile)
fixes 2pass vp6 encoding on linux


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29062 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-25 23:59:48 +00:00
Uoti Urpala 186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego ec3cc468ca cosmetics: Replace unused 'argc/argv' in main declarations by 'void'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28634 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 12:00:43 +00:00
diego be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:16:19 +00:00
diego 1b915e419e Replace double semicolon by single semicolon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
Uoti Urpala ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
compn 16e790999a remove sys/timeb.h include
fixes compilation on uClibc based i386 system
patch by Markus Heidelberg markus(x.x)heidelberg(x@x)web(x.x)de
ok'd by diego


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28387 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-29 03:36:14 +00:00
Uoti Urpala 79e1aa7cc7 Merge svn changes up to r28341
Conflicts:
	configure
	libmpcodecs/native/rtjpegn.c
2009-01-19 00:04:43 +02:00
diego cc52547ece Reduce QuickTime binary decoder verbosity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28340 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-17 21:33:30 +00:00
Uoti Urpala 9bcd12fdf5 Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
diego e117f31d23 #include the appropriate header instead of using local declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28268 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:53:45 +00:00
diego 824abb5a65 Add missing 'void' keyword to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
Uoti Urpala c1b80dcbbb Merge svn changes up to r28204 2008-12-27 17:40:57 +02:00
diego 47044eb841 Avoid u_ BSD type names.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-27 12:03:51 +00:00
Uoti Urpala a3ab9e8e46 Merge svn changes up to r28149 2008-12-14 17:28:16 +02:00
diego 8af5e8b497 Change some printf calls to 'Debug printf' so as not to pollute stdout.
based on a patch by Zhou Zongyi, zhouzongyi pset.suntec net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28128 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-11 21:29:01 +00:00
Uoti Urpala cb3dc68691 Merge svn changes up to r28103 2008-12-06 02:16:51 +02:00
reimar 45904b63ef Re-add "extern"s incorrectly removed in r28085
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28088 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-04 15:07:15 +00:00
Uoti Urpala 8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02: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
Uoti Urpala e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
reimar 5fefd9f70a Missing free in malloc error case in COutputPinCreate.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27871 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 13:13:52 +00:00
reimar fa504971c5 Avoid useless casts of malloc results.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27870 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 13:12:54 +00:00
Uoti Urpala 0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
diego 33c347f66e Translate a Hungarian comment, thanks to Denes Balatoni.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27806 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 20:02:21 +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 8322f0aef1 Remove pointless #ifdef around the whole file, it is just a complicated #if 1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27760 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:06:15 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
diego 984d028cd2 Remove duplicate vsscanf fallback implementation, we have another in osdep/.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27476 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-22 20:53:44 +00:00