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

44 Commits

Author SHA1 Message Date
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 2093097cfb Remove pointless attribute_used from variable declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27780 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-16 18:08:18 +00:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441 
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
 2008-08-08 02:13:09 +03:00
diego 091d352d06 Rename font-related preprocessor directives. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 10:36:07 +00: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 5423c418c2 cosmetics: Remove useless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:42:28 +00: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 2bcfe1e077 Add new video driver API 
Create new video driver API that has a per-instance context structure
and does not rely on keeping status in global or static variables.
Existing drivers are not yet converted to this API; instead there is a
wrapper which translates calls to them.

In the new API, an old API call vo_functions->xyz(args) is generally
replaced by vo_xyz(vo_instance, args).

The changes to keep the vesa, dxr2 and xover drivers compiling have
not been tested.
 2008-04-23 13:41:04 +03:00
reimar fbae3928cd Allow independent scaling of vo_font and sub_font. 
Patch by Guillaume LECERF (foxcore gmail com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-27 15:14:02 +00:00
ulion b6870cc5ba From now on, libmenu does not steal all input keys from input modules. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25530 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-26 13:13:48 +00:00
ulion c8a8ffcf36 Simplify the condition code. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25524 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-25 04:30:16 +00:00
ulion 673246be0c OSD menu support mouse selection. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 06:14:38 +00:00
ulion a986e2a1f6 Remove hardcoded key->cmd bindings in libmenu, support custom key bindings 
by menu config file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25291 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-04 10:42:59 +00:00
reimar 844c8ffc48 Mark several uses of vo_functions_t as const to stop some of the current 
hacks e.g. in vidix code from spreading.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25247 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:24:23 +00:00
ulion 8db062d683 Remove the pause filter and the cmd queue hack, to know the mplayer going to 
pause by checking mpctx directly. If there's any video update before the pause
then capture the frame or fallback to use last captured frame as pausing frame.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25054 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-15 01:07:56 +00:00
ulion e573695a08 Fix pause key problem in correct way, only handle pause cmd when showing menu. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24988 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-08 05:41:26 +00:00
reimar 40a4f3c7c6 Fix link to email explaining the paused vf_menu behaviour change 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24957 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-11-03 16:22:45 +00:00
cehoyos f2dee327b2 Move alloc_mpi and copy_mpi from libmenu/vf_menu.c to libmpcodecs/mp_image.c. 
Patch by Attila Ötvös.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24014 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-04 22:12:49 +00:00
reimar 5d02058b47 Do not use fast_memcpy for small size copy, esp. when the size is constant 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23476 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-05 15:09:49 +00:00
reimar 6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow 
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-05 14:27:54 +00:00
ben 32012ea3bc rename some menu open functions, to avoid confusion with libc native open() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23384 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-25 10:26:39 +00:00
ben 194fc1b15b add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-05-20 16:10:45 +00:00
uau 00b3c78196 Fix menu to work with mpctx 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22302 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-02-21 18:28:48 +00:00
gpoirier f4738068b0 fix identation, broken by last commit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21943 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-16 13:28:22 +00:00
gpoirier 7c450c5275 speeds up mplayer execution by over FIVE times when all of the of the following apply: 
* menus are enabled
 * menus are enabled but not displayed
 * direct rendering is in use
Patch by Adam Sulmicki % adam A cfar P umd P edu %
Original thread:
date: Jan 7, 2007 11:07 PM
subject: [MPlayer-dev-eng] [PATCH] slow menus : try two

Other threads:
date: Jan 7, 2007 12:39 PM
subject: [MPlayer-advusers] [patch] slow menus

Also:
date: Jan 6, 2007 11:13 PM
subject: [MPlayer-advusers] [patch] slow menus

And:
date: Jan 2, 2007 11:46 PM
subject: [MPlayer-advusers] slow down with menu off

Finaly:
date: Dec 24, 2006 11:25 AM
subject: [MPlayer-users] slow down with menu off


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21942 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-16 13:24:03 +00:00
gpoirier 5ddf53dde6 woops, actually fix URL this time 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21836 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-06 13:31:16 +00:00
gpoirier 190ea55d2e update comment url 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21831 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-01-06 10:07:45 +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
ben 0edb9429c5 fix menu toggle/hide issues 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19495 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-08-22 19:40:50 +00:00
reynaldo bf25812a43 Part1 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17995 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-30 06:40:58 +00:00
albeu 0e38597ae8 Allow 6 ways (up/down/left/right/ok/cancel) navigation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17946 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-25 17:32:10 +00:00
michael 35b0fb5056 10l (forgot ...) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17909 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-21 22:31:49 +00:00
diego 5aba6c3cfd Unify include paths, -I.. is in CFLAGS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16863 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-10-26 00:07:43 +00:00
faust3 8352d2c244 support newer gcc 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13529 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-10-02 12:17:28 +00:00
faust3 0e339fc397 option to display menu at startup, patch by Aurelien Jacobs <aurel at gnuage.org> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13345 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-09-15 13:37:49 +00:00
diego 8838b4afa6 output typo fixes: unknow --> unknown 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-07-09 01:30:24 +00:00
alex 23e0f24f27 10l fix by Vladimir Mosgalin <mosgalin@VM10124.spb.edu> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9904 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-04-10 15:07:59 +00:00
albeu 90a3d11031 10L forgot this filter. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9756 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-03-30 17:15:19 +00:00
arpi c8b0ddfe4e these patches let ,,oldstyle'' and freetype subtitle renderers live 
together happily. if an oldstyle subtitle (font.desc) is found, it will
be used. otherwise mplayer will choose subfont.ttf, if freetype was
detected during ./configure.
(also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too)
patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-29 14:59:23 +00:00
rathann 84834e9d34 Added/reordered #includes to silence warnings about "implicit declaration". 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8624 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-28 18:51:10 +00:00
colin 1344f05cba better fix for my previous 10l 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8252 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-11-22 12:01:59 +00:00
colin 5e4ff93c81 don't fully-copy the planes if the menu doesn't show (faster) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8245 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-11-21 18:31:21 +00:00
albeu dc7759b0a8 Fix freetype. Freetype is highly recommended for a nice output ;) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8225 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-11-18 00:09:37 +00:00
albeu c83ebc0b7d OSD menus initial version 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8198 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-11-14 23:47:11 +00:00