Commit Graph

28204 Commits

Author SHA1 Message Date
cehoyos e3bf64337e Replace pushf/popf by explicit pushfl/popfl (32 bit) or pushfq/popfq
(x86_64), to fix generated code on ICC 11.0.
Original FFmpeg patch by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28037 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 18:36:50 +00:00
reimar 16a685b00c 100l, OSD alpha textures were cleared to the wrong value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28036 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 18:24:23 +00:00
gpoirier a5581ec3b8 typo fix + readability improvement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28035 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 09:54:34 +00:00
torinthiel 11c6b99a32 Another part of sync to 27843
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28034 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 22:42:19 +00:00
diego 649e7d30c6 Sync with latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28033 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 21:23:16 +00:00
compn f6e7167a76 add more informative comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28032 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 20:50:14 +00:00
diego 9051c1348d Remove unnecessary #ifdef around a struct and a bunch of extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 17:35:08 +00:00
gpoirier 0cee72fb5b now that we have a specific check to enable ao_macosx or not, don't let test
for vo_quartz set if ao_macosx should be enabled or not: it's redundant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28030 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 17:29:37 +00:00
gpoirier 3fa1eb2a60 add specific test to check if we can enable ao_macosx not matter how vo_quartz test may turn out
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28029 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 17:27:05 +00:00
diego c27cdb7288 Do not initialize fb_dev_fd to -1, similar to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28028 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:44:09 +00:00
diego 1add1d6597 cosmetics: Add/remove a few newlines similar to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28027 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:35:08 +00:00
gpoirier 76797a077c cosmetics (svn diff --diff-cmd diff -x '-duwbBE' gives no differences)
replace tabs by 4 spaces.
prettier intentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28026 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:29:32 +00:00
gpoirier 20011636d2 avoid putting several statements on a single line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28025 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:25:14 +00:00
gpoirier 40a450c69b Use doxygen-style comments in file header. Remove tabs usage.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28024 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:34:31 +00:00
gpoirier 45b0d94b60 whitespace-cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28023 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:28:56 +00:00
gpoirier 6f60722148 Allow vo_macosx to be compiled in 64-bits mode:
- Replace usage of undocumented Apple function CPSEnableForegroundOperation()
   (which is available in 32-bits mode, but not in 64-bits mode) by
   TransformProcessType() which is public, documented, and available since OSX 10.3.
 - Work around Apple bug #6267445 since OSServices Power API is diabled in
   64-bits systems
Based on patch by Gregor Riepl %onitake A gmail P com%
posted in thread:
date: Fri, Oct 3, 2008 at 4:49 PM
subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28022 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:22:18 +00:00
reimar 9d065b41e8 More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28021 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 11:04:50 +00:00
gpoirier b236cc711b Replace QuickDraw calls in vo_quartz.c to fix warnings when compiling with current SDK versions.
Patch by Gregor Riepl %onitake A gmail P com%
Original thread:
Date: Wed, Oct 29, 2008 at 7:26 PM
Subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28020 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 10:01:03 +00:00
reimar 2c6a12c01d Remove a ColorFill that is not necessary since the surface it is used
on has exactly the same size as the video image and the video will
be copied into it before it is used the first time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 09:46:23 +00:00
reimar 5cb896b7eb Make sure the backbuffer is cleared when the border size might have changed.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28018 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 09:44:33 +00:00
diego 582bb322d7 Remove useless setting of frame_buffer to NULL as suggested by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28017 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:43:13 +00:00
diego 4daa28d0a5 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28016 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:41:44 +00:00
diego 472e68dace Move setting of frame_buffer variable out of 'if', as preferred by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28015 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:40:11 +00:00
diego 5351098826 Create a separate codecs.conf entry for Tremor and use it if MPlayer is
with Tremor support instead of libvorbis. Previously MPlayer would show
the same output on the console when decoding with libvorbis and Tremor.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28014 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:31:44 +00:00
diego 17aebba77f Fix HAVE_VIS vs. HAVE_MVI typo, SPARC has MVI, not VIS.
patch by Alexis Ballier, alexis.ballier gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28013 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:29:34 +00:00
gpoirier 45ff1218a6 sync w/r27979
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28012 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 22:01:54 +00:00
reimar 6c3457bd0e Clear the whole window on resize in vo_x11 since we do not
yet know how large the borders will be.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28011 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:49:05 +00:00
reimar 7428efabee Simplify vo_x11 check_events function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28010 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:47:04 +00:00
reimar b704defedd Do not draw in window if our image has not yet been adjusted to the new window size.
Fixes some cases of borders not being black in fullscreen when fullscreen image
is scaled down.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28009 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:39:15 +00:00
reimar af80fe7f12 Remove unnecessary xf86vmode.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28008 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:20:51 +00:00
reimar ff05d203b2 Remove some usnused variables and commented-out code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28007 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:19:06 +00:00
reimar 307953643d Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28006 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:17:46 +00:00
reimar 97eeb07265 Patch to improve/consistify coding style.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:50:39 +00:00
reimar d86a77d8ba Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:45:01 +00:00
reimar cc7e0dae7e Lock/unlock surface only once even when drawing many slices.
Patch originally by Jim Hauxwell [james dattrax co.uk]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28003 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:42:29 +00:00
reimar 161092eb35 Move locked_rect from stack to priv struct in preparation for following patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28002 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:24:53 +00:00
reimar e148ffb3ec Move the StretchRect call from draw_slices to render_d3d_frame.
This avoids calling it (and BeginScene/EndScene) many times with
slices and also avoids code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28001 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:13:56 +00:00
reimar 2e5c6e2f4e Remove pointless is_cfG_finished variable.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28000 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 17:25:46 +00:00
diego 5b239d47bd Handle fb_dev_name similar to vo_fbdev in vo_wii.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27999 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:57:51 +00:00
diego 9aa2edf9d1 Merge another if condition check to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27998 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:32:39 +00:00
diego df58b1815f Use static variable instead of #define to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:15:54 +00:00
diego 9c8445f5f9 Get rid of TTY_DEV_NAME #define to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27996 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:55:23 +00:00
diego c6af321ba7 Merge another if condition check to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:51:16 +00:00
diego 2a044df222 Merge if condition check to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:42:41 +00:00
diego 3e0abbff54 Remove debug function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27993 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:41:57 +00:00
diego ce17f21bb1 cosmetics: one more round of whitespace changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27992 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:23:14 +00:00
diego 8ea5ce98d8 cosmetics: further reformatting to lessen differences to vo_fbdev.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27991 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:19:43 +00:00
diego 92ea709db2 cosmetics: complete reformatting, tabs to spaces, etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27990 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:06:37 +00:00
diego 21a6361d95 cosmetics: Lessen differences to vo_wii.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27989 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:02:10 +00:00
diego d0a4035bad cosmetics: consistent formatting for if/else/case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27988 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:46:42 +00:00