1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 19:22:11 +00:00
Commit Graph

150 Commits

Author SHA1 Message Date
Uoti Urpala
6d534cd3cb vidix: drop VIDIX support
By now VIDIX is too obscure to justify the amount of code and
complexity it requires in the sources. Although there is no pressing
need to drop it just now from a code point of view, I'll rather remove
it before release than release with VIDIX support and then drop it
later.

Some of the manpage mentions of VIDIX were in "this option supported
for these VOs" lists that looked outdated and failed to mention vdpau
for example. Replace such incorrect lists with a generic "not
supported for all VOs" mention.
2011-01-31 16:03:10 +02:00
Uoti Urpala
c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
diego
690bcb7b2c libvo: remove UNUSED() macros
Remove UNUSED macros used to shut up unused function parameter warnings.
The macros are duplicated all over libvo and serve no useful purpose
nowadays.  A better way to shut up the warnings is -Wno-unused-parameter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32422 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego
c310e7cedc vo_vesa: mark a function static
Mark fillMultiBuffer() as static, it is not used outside of the file; fixes:
libvo/vo_vesa.c:532: warning: no previous prototype for 'fillMultiBuffer'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32284 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego
21ea779e7a vo_vesa, vo_directfb2: Replace local min/max macros by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32282 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02: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
17eb7f2c4b Merge svn changes up to r30195 2010-01-08 02:06:42 +02:00
reimar
ef395a2f08 Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30192 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:12:12 +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
cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
reimar
b4f5702c0a Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
This might avoid some issues since sws_scale in some cases assumes these
have at least 4 valid entries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29101 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:37:21 +00:00
Uoti Urpala
186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego
be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:16:19 +00:00
Uoti Urpala
259ea9d703 Merge svn changes up to r27573
Conflicts:
	libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03:00
diego
3311a2ae9c Replace casual GPL notices by proper license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:09:51 +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
diego
835c654bb0 typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
diego
f7906235ad Fix illegal identifiers, names starting with __ are reserved for the system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25889 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 18:01:19 +00:00
diego
c98db3f442 Relicense files written by Nick Kurshev and marked as "GPL v2" to
"GPL v2 or later" with permission from Nick.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25555 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 22:40:24 +00:00
diego
8792b72b1e Remove redundant extern declarations, fixes the warnings:
vo_vesa.c:55: warning: redundant redeclaration of #monitor_hfreq_str#
video_out.h:252: warning: previous declaration of #monitor_hfreq_str# was here
vo_vesa.c:56: warning: redundant redeclaration of #monitor_vfreq_str#
video_out.h:253: warning: previous declaration of #monitor_vfreq_str# was here
vo_vesa.c:57: warning: redundant redeclaration of #monitor_dotclock_str#
video_out.h:254: warning: previous declaration of #monitor_dotclock_str# was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25551 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-30 12:12:47 +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
reimar
f3514ce516 Remove video_out_png extern in vo_vesa (remains of ill-advised
vo-based screenshot function).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25242 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 13:47:18 +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
aurel
d715b5be37 call vbeGetControllerInfo() only once
Subsequent calls would fail with some video chip (including i945)
when using -fixed-vo.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22785 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-23 00:31:29 +00:00
diego
196bee14d3 Fix unkown --> unkNown typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22483 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-07 01:31:29 +00:00
ben
c796e21e3c don't fatal if saving vesa state failed (this always fails on qemu, with this patch vesa now works under qemu)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21818 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-04 16:07:42 +00:00
reimar
18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-07 11:58:07 +00:00
diego
ccb6adc9ef Correct include path for bswap.h, patch by Carl Eugen Hoyos, cehoyos ag.or.at.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21408 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 11:24:19 +00:00
ben
d463c9e96d if double buffering is enabled, but vbeSetDisplayStart() fails, turn double buffering off (also adds support for VESA output under VMware).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19537 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-25 19:52:00 +00:00
lucabe
cc30aae17b Move postproc ---> libswscale
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18866 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-30 12:00:31 +00:00
diego
3f62423f42 Rename some misspelled and misnamed messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18336 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-28 23:06:42 +00:00
reynaldo
78417bf0dd Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 04:23:53 +00:00
diego
eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
diego
20b8cba8fb Make include paths consistent among files in libvo. Since -I.. is added
to the CFLAGS in the Makefile this should be safe.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16842 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-23 16:19:32 +00:00
alex
6c5df75cce use libvbe from vesautils
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16257 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-18 11:26:04 +00:00
alex
76f0fb31b6 10l, patch found in geexbox
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16197 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-11 11:02:30 +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
rfelker
df48e121b0 strides should always be signed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14797 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-24 17:08:54 +00:00
faust3
1addcfe22b Currently vbeGetProtModeInfo call the 0x4f0a function of int 10h the get
a simple 32 bits protected mode interface to some VESA functions. This
protected mode interface is interesting because it's quicker than the
raw int 10h interface.
Unfortunatly, begining with VBE 3.0, the 0x4f0a function is optional,
and some video cards don't implement it (3dfx, intel 845/855/865...).
This protected mode interface is then only used in vbeSetWindow and
vbeSetDisplayStart :
 - vbeSetWindow already implement an alternative methode if protected
mode interface is not available.
 - vbeSetDisplayStart also contain an alternative implementation, but
this one is disabled with a #if 0. I don't exactly know why because
it works well !

So currently, cards which don't have the 0x4f0a function are not
supported. This patch correct this.
 - vbeGetProtModeInfo failure is not fatal.
 - vbeSetDisplayStart has it's alternative implementation reenabled.
   it's used only with cards which don't have the 0x4f0a function
   so this won't make any difference for cards which were already
   working.

This patch also make the failure of vbeGetModeInfo not fatal. The
VBE 3.0 standard state that GetModeInfo can fail with some mode
which are listed as supported if the mode can't be used in the
current situation (not enough video memory for example). So a
failure of vbeGetModeInfo don't mean that other modes won't work
and should really not be fatal.

patch by Aurelien Jacobs <aurel@gnuage.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13569 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-06 08:42:13 +00:00
faust3
f4ea8c729f use aspect code when used with vidix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13481 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-26 15:10:47 +00:00
faust3
9db0e66a3b 10l query format at least when used with vidix, disable colorkeying with vidix, should fix #38 and #33
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12927 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-01 11:17:27 +00:00