Commit Graph

30 Commits

Author SHA1 Message Date
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Uoti Urpala 1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego befc528297 Add standard license headers, unify header formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +00:00
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 33f7abfe2c Improve error message when screen width and height are not set.
patch by Christian Ohm, chr.ohm gmx net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27802 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 11:47:46 +00:00
Uoti Urpala de560e8167 Merge svn changes up to r27123
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
2008-06-23 03:58:44 +03:00
ben 144b0d05cd remove now useless vidixlib.h file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27111 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:16:34 +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 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
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 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
rathann f78363e244 Remove spurious casts to int. Blessed by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 16:40:11 +00:00
rathann e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar 7c9f087906 Support equalizer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16389 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-04 20:58:39 +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
faust3 de02c050dd 10l initial patch by Oded Shimon <ods15 at ods15.dyndns.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14042 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 17:23:13 +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
faust3 f5d3da024c center the image when screenw & height are set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13361 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-17 09:56:09 +00:00
faust3 d32a38dfed Changed the default again so that the initial video position is in
the upper left corner like in vo fbdev[2].
Reason: vo cvidix does not know the screen resolution unlike you specify
it with screen[w/h], resulting in the video being displayed on a random
position.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13356 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-16 18:08:17 +00:00
diego 55a4120972 output wording
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12784 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-09 15:29:40 +00:00
faust3 4682a5f0bc default is now to center the image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12770 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-06 19:57:03 +00:00
gabucino 409e6aee29 message expanded with hint to use -v option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11463 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-15 09:58:15 +00:00
faust3 c33e284a43 added aspect && geometry support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11233 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-22 18:32:04 +00:00
alex 836d219075 fixed -nocolorkey
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11217 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-22 13:22:00 +00:00
alex a34978c3a7 Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
by Jake Page <jake@CS.Stanford.EDU>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11159 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-17 09:08:37 +00:00
faust3 9870d00362 consolevidix -> cvidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11020 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-05 15:39:00 +00:00
faust3 54818d9782 consolevidix -> cvidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11018 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-05 15:34:40 +00:00