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

53 Commits

Author SHA1 Message Date
Uoti Urpala 849dc0ba31 Merge svn changes up to r27649 
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
 2008-09-20 16:13:33 +03:00
syrjala d4471e0a09 Update the copyright statement. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27626 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 20:46:43 +00:00
syrjala b129179e5d Cosmetics: 
- Convert tabs to spaces
- Remove trailing whitespace
- Remove useless comments


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27625 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 20:45:17 +00:00
syrjala 7c94b44308 Don't limit BES to non-synced single buffering when CRTC2 is used. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27624 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 20:43:24 +00:00
syrjala af709594ea Rename some variables and change some strings to make the CRTC1 code clearer. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27623 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 20:41:08 +00:00
syrjala 654db62437 Add CRTC1 support. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27622 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 20:39:03 +00:00
syrjala 9a00106a58 Remove BGR24 support since it has never worked anyway. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27621 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 20:35:05 +00:00
syrjala d45397dbdd Eliminate void * arithmetic. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27615 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 11:47:02 +00:00
diego 4ca1fa0a08 Upgrade license of LGPL 2 or later files to LGPL 2.1 or later. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27614 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 05:40:29 +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 ad603f5559 cosmetics: Remove useless parentheses from from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 08:33:27 +00:00
Uoti Urpala de56d2d9f5 Remove variable arguments from vo control() functions 
No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
 2008-04-23 13:41:03 +03:00
Uoti Urpala dbe080ec9f Change VOCTRL_[GET|SET]_EQUALIZER argument passing 
These were the only voctrl types with more than one argument. The
second argument was passed using variable arguments. Change them to
use a single argument (address of a struct containing both old
arguments). This makes forwarding the arguments to other functions
easier and allows simplifying code.
 2008-04-23 13:41:03 +03:00
reimar 2bf8c692f1 Mark the vo_functions_t definitions as const where possible. 
This is not possible for xover and anything supporting vidix
due to horrible hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:39:15 +00:00
reimar 909887bdbe Make vo info structs const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:06:03 +00:00
diego 6c2ee72a4c Fix warning: 
vo_dfbmga.c:231: warning: redundant redeclaration of 'uninit'
video_out_internal.h:37: warning: previous declaration of 'uninit' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24175 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-25 13:13:08 +00:00
rathann 259cfbe7e2 Code cleanup: don't include a .c file in mplayer.c and fix a few 
"implicit declaration of function ‘mplayer_put_key’" warnings

Based on Attila's suggestions.
Approved by Uoti and Ivan.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-29 17:16:11 +00:00
syrjala 3668b5afc5 s/vo_osd_changed/vo_osd_changed_flag 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20285 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-17 13:23:13 +00:00
syrjala f3068fb85d Round buffer width and height to 16 pixels. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20284 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-17 13:19:31 +00:00
syrjala 8db718fbf8 Fix DirectFB version check. The old code simply concatenated the 
digits, so 1.0.0 was considered older than 0.9.XY.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20118 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-08 22:16:38 +00:00
diego 66b1d0d001 The FSF changed postal address. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-09-01 12:11:11 +00:00
diego 55859c930c Remove superfluous extern variable declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17971 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-27 07:31:08 +00:00
ptt 126f151cda changed KEY_PREVIOUS to KEY_PREV, cause the first undefined 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16897 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-11-03 10:50:43 +00:00
albeu 374db42e17 libvo input cleanup: remove the dependency on libinput, 
remove most of the crappy mappings (like O->o or ESC->q).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16893 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-11-02 21:50:55 +00:00
syrjala 8db8ad3fcf Added support for remote controls. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16865 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-10-26 07:41:41 +00:00
ivo cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but 
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-08-05 01:24:37 +00:00
henry dbb001bae2 replace VO and VF numeric flags with #defined identifiers 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-04-18 15:52:38 +00:00
syrjala 0046a87017 Clean up properly if preinit() fails. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14930 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-03-07 22:45:47 +00:00
syrjala 541480d759 Added NV12/NV21 support. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14717 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-02-17 00:05:23 +00:00
syrjala 30486c5acc - Don't advertise IMGFMT_RGBxx 
- Updated copyright line


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14627 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-01-31 17:59:36 +00:00
diego 5b0d96c6b4 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way. 
Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-10-28 01:15:53 +00:00
syrjala ed19d7f62d Fixed [no]input suboptions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13460 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-09-25 13:46:21 +00:00
syrjala 43a23a54d3 Removed fb_dev_name handling. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-20 14:09:16 +00:00
syrjala ad1787ad0b Removed useless SetOpacity() calls. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13029 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-15 00:27:28 +00:00
syrjala 5fcaa7d4a1 Fixed BES aspect ratio. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13028 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-15 00:25:23 +00:00
syrjala 7a1e8266dd Reorganized init/unint so that fixed-vo works. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13027 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-15 00:12:34 +00:00
syrjala 36e5a58db2 Don't use flicker filtering. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12981 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-09 18:00:12 +00:00
syrjala 79b028bc54 Fixed CRTC2 surface size message. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12277 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-04-25 13:55:54 +00:00
attila 08b0da4c33 fieldparity verbosity and tvnorm patch 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11988 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-02-22 15:27:15 +00:00
alex 4aeb0a76c9 support for latest CVS, patch by Ville Syrjala 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11867 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-01-28 10:19:49 +00:00
alex e6bf2b355a backward compatibility patch by Ville 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11158 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-10-17 08:36:47 +00:00
alex 6a77ff8045 Updates by Ville Syrjälä <syrjala@sci.fi> 
- Add black bars around the video when using the BES.
- Clean up properly in uninit().
- Advertise only YUY2 on a G200.
- Add "G200" to the description :)
- Remove/fix a few leftovers from old patches.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11148 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-10-16 12:18:12 +00:00
alex 0f7903dfce spring update patch by Ville Syrjala <syrjala@sci.fi> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9980 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-04-24 18:52:16 +00:00
alex fc5d27378b Update sub-picture layer to work with recent DirectFB cvs and add support for selecting field parity. Patch by Ville Syrjl <syrjala@sci.fi> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9462 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-02-19 16:01:46 +00:00
arpi 7ff83a7181 linux->osdep 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-02-09 20:18:23 +00:00
arpi 030b628942 * Remove unneeded includes & macros 
* Get layers by name rather that fixed ID. Only works for DirectFB >=
0.9.16 so fall back to ID based stuff for older releases.
* New option "noinput" (useful in X)
* Add some NULL pointer checks to uninit()
* Improve error messages and use mp_msg()
* Direct rendering fix (at least IPB was broken)
* Use 0xff for alpha component in all colors
* Blit from temp surface to screen was only done in draw_osd() which
doesn't always get called. Do the blit in flip_page() in this case.
* Add GUI support to control()
* Change the driver name to include G450/G550 ;)

patch by Ville Syrjälä <syrjala@sci.fi>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9022 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-01-19 15:41:26 +00:00
zdar 03a58e7c7b fix to compile with DirecFB 0.9.16 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8641 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-29 18:07:18 +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
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
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