1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-15 03:15:52 +00:00
Commit Graph

1240 Commits

Author SHA1 Message Date
rathann
64c7077884 Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg".
Arpi: feel free to change... ASAP :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8618 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:03:23 +00:00
arpi
17c39c4e57 The following patch adds two new command line options:
-sub-bkg-color n
-sub-bkg-alpha n
They control the color and alpha value used to initialize the subtitles and OSD BBOX.
With this you can have subtitles inside a traslucent rectangle.
This is useful when a movie already have "hardcoded" subtitles and you
want to overwrite them with rendered subtitles avoiding too much confusion.

patch by Salvador Eduardo Tropea <salvador@inti.gov.ar>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8602 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:41:02 +00:00
arpi
2e399f394d DVB-HEAD (aka. NEWSTRUCT) detection & support
patch by Dimitrios Dimitrakos <mail@dimitrios.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8595 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:04:58 +00:00
arpi
501706292e -subwidth
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8584 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 21:41:40 +00:00
arpi
62490c001c backward compatibility :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8579 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 17:28:35 +00:00
alex
fc447a4d4c 10l memory leak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8578 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:42:11 +00:00
mswitch
e5662528ac Added patch from Thomas Jarosch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8550 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-24 12:45:32 +00:00
arpi
725ff339e7 This patch adds support for vertical subtitle alignment
control. Possible values are top, center, and bottom,
with bottom being the default. Alignment is relevant when
it comes to positioning subtitles with one line (or fewer
lines) of text relative to multi-line subtitles.

It is implemented as a new command (sub_alignment) that
without an argument cycles the alignment (between top,
center, and bottom), or with an argument sets the
alignment (0 for top, 1 for center, 2 for bottom).
The key 'i' is bound to this command.

patch by Oskar Liljeblad (oskar@osk.mine.nu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8535 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 01:37:43 +00:00
alex
71a7257eb4 10l by Matan
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8521 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-22 13:27:05 +00:00
faust3
2499234aaf 10l and correct aspect
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8520 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-21 23:49:33 +00:00
alex
08346ddf82 vidix support and better device options handler by Matan Ziv-Av <matan@svgalib.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8516 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-21 22:08:14 +00:00
arpi
3d51a6039a I have rewritten the gif89a vo in order to solve some problems I had
with it.  These are:
1) current code is messy
2) poor comments, if any
3) inaccurate frame dropping and delay code
4) output filename hardcoded
5) output framerate as integer

You may specify the output filename and framerate like so:
-vo gif89a:4.33           4.33 fps output
-vo gif89a:some.gif       output to some.gif
-vo gif89a:5.02:new.gif   output to new.gif at 5.02 fps
The filename defaults to out.gif, and the framerate defaults to 5 fps.

by Joey Parrish <joey@nicewarrior.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8515 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-21 21:07:16 +00:00
faust3
a099f6cf8c 10l - my system is very tolerant it seems
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8496 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-19 12:01:50 +00:00
rfelker
dba1874d20 1000l! I have no idea how this code worked at all before. I guess no
one tests win32 much anyway... :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8491 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-18 07:34:32 +00:00
alex
2e0f15e0c8 this isn't mplayerxp...3 buffers are enough for double(triple)buffering (instead of 28 buffers ;)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8460 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 18:18:41 +00:00
arpi
b987127e0e compiler warning fixes
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8452 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 17:56:35 +00:00
arpi
bbeb54d80a notice vo driver about skipped/dropped frames
patch by Alvaro Lopes <alvieboy@alvie.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8451 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 17:12:40 +00:00
henry
9c96ec9a50 memory leak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8447 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 11:14:37 +00:00
henry
6ab9415443 use more methods to get the fs window on top
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8446 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 11:09:06 +00:00
henry
d9b33edbba progbar osd buffer height adjustment fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8423 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-10 23:10:24 +00:00
arpi
cd1d63b19d fullscreen fix for KDE (reported to work with gnome 1/2 too)
patch by "Puk Madick" <pingy@swirvemail.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8411 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-08 01:35:07 +00:00
arpi
b318b50c82 The detection of a NetWM class window manager hints is tested before
the test of a gnome class windomanager hints, since the gnome hints
are outdated and replaced by the newer NetWM specification. Newer
versions of Gnome support this standard, and therefore the test should
be placed before the Gnome test. Windowmaker does not support NetWM
and is checked after the NetWM test. In fact the new code should be
placed also before the test for IceWM. Regarding other WMs such as
KDE, IceWM the change is not tested.
patch by Svante Signell <svante.signell@telia.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8389 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-07 01:25:30 +00:00
arpi
268b2c1a0f overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:03:35 +00:00
arpi
c1d0b30ae1 This patch fixes the screensaver issues in mplayer. It will correctly read
and store the state of XScreensaver and KDE-Screensaver, will stop them and
restart them later, when the movie has finished ...
It works and was tested with KDE2/3 and XScreensaver 4.05.
patch by Fabian Franz <FabianFranz@gmx.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8355 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 23:31:46 +00:00
mswitch
339033d139 Use MVCOMMAND_SYNC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8318 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-29 21:40:37 +00:00
pontscho
57f77bb41a patch from tonglijing <tong@intec.iscas.ac.cn>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8268 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-24 21:28:32 +00:00
michael
01c201dbe8 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-23 10:58:14 +00:00
atmos4
f758086314 Add Quartz (OS X GUI) to SDL window-capable list, patch by Tomas Hurka <tom at hukatronic.cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8247 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-21 22:52:54 +00:00
albeu
9cec79240d The OSD menus need more keys
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8216 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 16:08:36 +00:00
arpi
305d04d563 This patch fixes the OSD flickering problem with vo_dfbmga.
Ville Syrjälä <syrjala@sci.fi>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8203 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:02:23 +00:00
rik
563dce2146 compilation fix by Sven Neumann <sven@gimp.org> of Blinkenlights fame
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8172 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 20:37:36 +00:00
albeu
126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +00:00
henry
2dc3b7951c fixed mode switching on Mac
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8150 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 16:14:28 +00:00
alex
6811f96358 removed get_info, using the same sheme as in libmpcodecs instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8149 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 15:22:10 +00:00
henry
35dc94a792 reversed wm order in vo_x11_setlayer + even upper layer for GNOME compliant wm's
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8148 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-11 14:26:07 +00:00
arpi
b3554885a2 This patch adds direct rendering to vo_dfbmga.
With only CRTC2 output all buffer setups are possible. If BES is used
only EXPORT and TEMP work. At least that's how I think it works :) IP/IPB
stuff was pretty much stolen from vo_xv.c.
patch by Ville Syrjälä <syrjala@sci.fi>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8139 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-10 13:58:46 +00:00
arpi
d48e57b659 Switch containing options for DirectFB library was renamed to dfbopts.
Layer selection is done as "subdevice" - integer nuber after -vo
directfb: where -1 is autodetection and 0,1,2... are for layers
example: mplayer -vo directfb:2 -dfbopts matrox-crtc2,matrox-tv-standard=pal *.avi


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8138 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-10 13:57:42 +00:00
arpi
b39016d60f fixed order of includes.
there is /usr/local/include[/freetype/freetype.h]
and      /usr/local/include/freetype2[/freetype/freetype.h] ... what a mess!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8137 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-10 13:12:53 +00:00
jkeil
a7ad5bd2ff On non-x86 platforms, memcpy was re-implemented in mplayer and was called
recursive.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8128 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-07 19:32:00 +00:00
arpi
f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
arpi
81a13c7698 - cleanup equalizer stuff (removed vidix dependency)
- error handling
patch by Ville Syrjälä <syrjala@sci.fi>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8122 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 22:20:35 +00:00
rik
68dbf5fd24 libavcodec sync (no LIBAVCODEC_BUILD change; no backwards compatibility)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8118 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 15:19:45 +00:00
albeu
6eebee1070 10L found by Mark <CompGuy284 at attbi dot com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8116 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-05 22:45:53 +00:00
henry
c987c2e4e9 yet another screensaver fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8098 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-04 08:21:46 +00:00
mswitch
ea73653582 Made new overlay functions static so they won't interfere with the rest
of MPlayer


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8093 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 20:59:04 +00:00
mswitch
8de6ee5d12 At least I can honestly say that I didn't add the equalizer support, so
I'm totally innocent here =)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8092 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 20:48:16 +00:00
mswitch
b8ace296df Suddenly I needed vidix.h for vidix_video_eq_t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8091 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 20:26:47 +00:00
mswitch
96c86b0385 Updated docs with DXR3 overlay info
Cleaned new sync code in dxr3
Renamed some internal variables to allow access from GUI


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8089 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 20:05:39 +00:00
nexus
867f528196 fix by Pontscho
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8087 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 16:58:07 +00:00
pontscho
a007cfa113 arpi add direct render support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8085 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 15:14:36 +00:00