Commit Graph

84 Commits

Author SHA1 Message Date
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
diego 8484309af2 Remove obsolete extra elements from opt_t struct initialization.
Fixes a bunch of 'excess elements in struct initializer' warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28957 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 10:03:09 +00:00
Uoti Urpala ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
reimar 05119ecaf6 Make data related to suboption parsing const in libvo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 08:51:40 +00: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 8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
diego fda888c61c Remove unused declarations and references to vo_draw_text_osd(),
vo_draw_text_progbar(), vo_draw_text_sub().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 18:53:35 +00:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03: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 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 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 cbd64522f6 warning fix:
vo_aa.c: In function 'preinit':
vo_aa.c:664: warning: redundant redeclaration of 'aa_displayrecommended'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24257 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 10:51:13 +00:00
reimar 3bcc77bea7 Fix wrong calculation of nbooleans that causes a crash on 64 bit systems
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24247 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 17:53:35 +00:00
diego 529d2f8030 warning fix:
vo_aa.c:89: warning: redundant redeclaration of 'aa_defparams'
/usr/include/aalib.h:371: warning: previous declaration of 'aa_defparams' was here
vo_aa.c:90: warning: redundant redeclaration of 'aa_defrenderparams'
/usr/include/aalib.h:377: warning: previous declaration of 'aa_defrenderparams' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24195 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 17:13:18 +00:00
diego 10830393d6 Remove pointless variable declaration, the code that sets it is long-gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24190 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:42:40 +00:00
diego 3b1f4b6167 Remove stray comment, the code it commented is long-gone.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24188 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:41:10 +00:00
diego 5d9b793edd Identifiers should not start with two underscores.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24066 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-15 10:34:53 +00:00
cehoyos 104ce10b99 Fix likely mistake when using char*.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24052 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-13 08:32:47 +00:00
reimar 51ffb15405 Remove completely pointless "!= 1".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23638 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 11:04:02 +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
uau 544233bded Make compilation depending on USE_OSD unconditional.
USE_OSD was hardcoded to true in configure, manually turning it off
would break compilation, and most OSD-related code wasn't affected by it
anyway so it did nothing useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 19:21:16 +00:00
uau 5c9b90d7a1 Make some functions static.
Patch by Stefan Huehner, stefan at huehner org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18955 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 15:26:36 +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
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
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
ivo b0e5f570bb Convert vo_aa suboption parser to using the subopt-helper.
This obsoletes all -aa* commandline options. Use -vo aa:* instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14936 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-11 02:09:24 +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
alex 1c4586e8f9 100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10596 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:45:02 +00:00
michael 5b882e5130 vf_scale.h & related cleanup & some small warning fix by dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10234 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-01 21:59:29 +00:00
albeu 83e30adc4d Use new config headers and types.
Remove unneeded dupendency on mconfig


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9757 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-30 17:23:13 +00:00
michael 20faf3dc0d 10000l (YUV vs. YVU swscale fix/cleanup)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9698 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-27 16:04:53 +00:00
michael 767d5d6d4a 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9497 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-23 23:34:16 +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
henry 142ebc5c38 better fix of vo_aa font segfault
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9177 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-30 19:58:43 +00:00
albeu 126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +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