RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-20 18:28:01 +00:00
Code Issues Releases Wiki Activity
33,001 Commits 42 Branches 86 Tags 163 MiB
c3e46833c2
Commit Graph

75 Commits

Author SHA1 Message Date
Uoti Urpala
c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
Uoti Urpala
1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf" 
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
 2010-05-29 17:20:44 +03:00
Uoti Urpala
e1cd86076f Merge svn changes up to r31141 2010-05-07 22:13:35 +03:00
cehoyos
02641f54ee Add support for 12-bit color mode on framebuffer devices. 
Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-05-06 10:18:25 +00:00
Uoti Urpala
00323c06e2 Delete things related to old translation system 
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
 2010-03-10 03:47:14 +02:00
Uoti Urpala
5099b1458d Merge svn changes up to r30683 2010-03-10 00:52:17 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
b0986b3760 Merge svn changes up to r30463 
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
 2010-03-09 18:59:15 +02:00
diego
b2172f784d Mark a bunch of video filter structures as const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30704 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-22 14:03:46 +00:00
diego
36a14ac50c Declare externally used variables from vd.c as extern in vd.h. 
This saves declaring them as extern all over the place.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-22 09:51:44 +00:00
diego
e0bc115b4d cosmetics: Rename struct vf_instance_s --> vf_instance. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 15:48:03 +00:00
diego
28cf6ea2be Rename open() vf initialization function to vf_open(). 
This avoids clashes with fcntl.h under certain circumstances.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30680 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-21 13:40:49 +00:00
diego
0c3d44619b libmpcodecs: Remove pointless leftover '#if 1' preprocessor instructions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30608 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-17 21:36:00 +00:00
diego
23db422c3d Add missing license headers to all files in the libmpcodecs directory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-30 16:57:40 +00:00
Uoti Urpala
5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar
b01af7a428 Fix initialization values for vf_expand priv struct. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29958 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-22 13:26:57 +00:00
Uoti Urpala
e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
reimar
061da8b24b %lf is not a valid printf format specifier, use just %f instead. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29680 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-14 13:16:35 +00:00
reimar
d5d5bbbb35 Always keep a backup of the expand values from the command-line, so values 
will be recalculated correctly e.g. after aspect change and -vf expand=aspect=4/3
command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29666 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-10 16:49:20 +00:00
Uoti Urpala
95da34aa07 Merge svn changes up to r29532 2009-08-18 02:29:37 +03:00
ben
d4419a7869 Replace macro: MAX -> FFMAX 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29479 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-06 20:04:19 +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
02efad79a2 Update OSD while paused 
When OSD contents change while paused, try to change the OSD drawn in
the currently visible frame. If such OSD updates are not supported
then advance by one frame and draw the OSD normally. Add some support
for OSD redrawing to vo xv.

The new xv code makes a copy of the original frame contents before
drawing the OSD if MPlayer is already paused when the frame is drawn.
If such a copy of the current frame exists then the frame contents can
be restored and a different OSD drawn on top of the same frame.
 2008-12-09 04:31:07 +02:00
Uoti Urpala
a232f564d3 Create a context struct for OSD state 
This commit creates the struct and passes it to some functions that
needs to access OSD state but does not yet move much data from globals
to it.

vf_expand accesses the OSD state for rendering purposes outside of the
normal OSD draw time. The way this currently works is suboptimal, but
I did not attempt to clean it up now. To keep things working the same
way vf_expand needs to know the address of the state object to be able
to access the data even in the functions that should normally not need
it. For that purpose this commit adds a VFCTRL to tell vf_expand the
address of the object.
 2008-06-24 01:53:58 +03:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979 
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
 2008-06-04 08:10:48 +03:00
diego
c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 00:23:02 +00:00
Uoti Urpala
05ad815133 Mark some constant symbols as such 2008-04-26 16:35:40 +03:00
Uoti Urpala
b14909a955 Move opt_screen_size_[x|y] to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
0e757bf9da Remove _s/_st suffix from some struct names 
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
 2008-04-25 03:34:22 +03:00
Uoti Urpala
8716df2a41 Add context variable to vo_draw_text callback 
Add a context variable and rename the function to osd_draw_text. Create
a new vo_draw_text that is a wrapper for VOs using old API.
 2008-04-23 13:41:04 +03:00
reimar
b95c80ca86 Make all vf_info_t structs const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25249 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:57:15 +00:00
reimar
bf61021b10 Add code to clear left and right borders not only top and bottom. 
Patch by Tomas Janousek (tomi nomi cz) with small modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24263 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-28 13:54:27 +00:00
reimar
6d32d91eca Mark m_struct_t defaults as const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22045 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-28 16:48:01 +00:00
ben
fde73bb200 allows OSD menu to be displayed when using MPEG PES video out 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21821 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-04 16:46:15 +00:00
reimar
ad95e7a79a Do not modify parsed command-line values on config, 
use a local variable instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20577 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-01 10:52:23 +00:00
gpoirier
9d12ded234 fixes a bug when copying the image into a destination buffer smaller than the source. 
This occurs when the destination buffer is packed but the source buffer uses aligned h&w.
patch by John Koleszar < jkoleszar AH on2 POIS com >
original thread:
Date: Apr 11, 2006 4:27 PM
Subject: [MPlayer-dev-eng] [PATCH] Chroma plane copy in vf_expand


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18322 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-04-27 19:42:36 +00:00
reynaldo
b4c74fb28e Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18005 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-31 00:15:47 +00:00
michael
02b199e5e9 passing pts through the filter layer (lets see if pts or cola comes out at the end) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-21 21:26:42 +00:00
ods15
1fb2b70409 expand aspect works by display aspect, not video aspect. 
try 2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17103 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-12-05 17:52:00 +00:00
diego
36e1974be0 Unify include path handling, -I.. is in CFLAGS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-11-18 14:39:25 +00:00
rfelker
37584f552e 10l to whoever got aspect upside-down.. it's w/h, not h/w. hope this doesn't bother anyone already using it too much 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16838 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-10-23 15:25:10 +00:00
ods15
5a9e785331 cosmetics. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15942 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-07-08 06:39:47 +00:00
ods15
808c269a08 add 'aspect' and 'round' params to vf_expand. 
(my first commit! I hope I did this correctly ;)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15940 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-07-07 19:54:58 +00:00
henry
1d5b31d1d2 - preserve ordering of the slices 
- make sure that the black buffer is actually allocated to avoid sig11


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15253 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-04-24 09:29:01 +00:00
henry
755f101e9c fix displaying of the subtitles when using slices 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15100 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-04-10 15:37:43 +00:00
henry
0859bbe33a call draw_slice in top-down order (fixes crash with -vf expand=...,scale) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14075 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-12-01 09:32:48 +00:00
rathann
3f758ed442 small warning fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10312 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-06-19 18:26:13 +00:00