Commit Graph

26461 Commits

Author SHA1 Message Date
Uoti Urpala 27a30e310e Add the talloc memory allocator
Copy talloc.c and talloc.h from Samba (last changed 2008-04-17 in
commit 7b9a647ebbbe9ec9e1b82b42e3a8916396f91273).
2008-04-23 13:41:06 +03:00
Uoti Urpala bfe569b76e Move vo_ontop to options struct
Add a 'struct vo *vo' argument to the x11_common.c functions that
access the variable so it's available as vo->opts->vo_ontop. To keep
VOs using the old API working create a global vo variable that is set
to the currently used old vo. "vo_ontop" will be #defined to
"global_vo->opts->vo_ontop", and x11_common.h will add defines like
the following when it is included by old VOs:
 #define vo_x11_ontop() vo_x11_ontop(global_vo)
so that they will call the function according to the new declaration.
2008-04-23 13:41:06 +03:00
Uoti Urpala 6c9d09170d vo_gl[2]: Rename conflicting vo_ontop macro
Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with
other changes because it conflicts with a global variable name (gl2
actually called vo_ontop() as a function and used vo_ontop as an int -
this only worked because vo_ontop was defined as a function-like macro
and use without parentheses didn't trigger replacement).
2008-04-23 13:41:06 +03:00
Uoti Urpala 8ec90e5e4f Add option pointer to vo struct 2008-04-23 13:41:06 +03:00
Uoti Urpala 5045066574 vf.c: malloc+memset -> calloc 2008-04-23 13:41:06 +03:00
Uoti Urpala 9b06b5ed85 Move correct_pts to options struct 2008-04-23 13:41:05 +03:00
Uoti Urpala 0d59f81e54 Add option pointer to vf struct 2008-04-23 13:41:05 +03:00
Uoti Urpala 7039bc090a Add option pointer to demuxers and stheader.h structs 2008-04-23 13:41:05 +03:00
Uoti Urpala d3d12332d6 Declare demuxer *_streams fields with proper types
Give sh_audio_t, sh_video_t and sh_sub_t which before had typedef
names only a matching struct name (without _t) too.
Change the a_streams, v_streams and s_streams demuxer fields from
void * to struct sh_audio *, struct sh_video * and struct sh_sub *.
Remove a now unnecessary cast from mplayer.c.
2008-04-23 13:41:05 +03:00
Uoti Urpala 732ee3474a Move options "vo" and "ao" to common struct 2008-04-23 13:41:05 +03:00
Uoti Urpala 9db0c118d3 Start of new option system
First part of option restructuring. The aim is to move option values
from a huge number of separate globals to a single non-global struct.

This part adds some support for parsing option values into such struct
instances, and moves one example option (fixed-vo) to the struct.
2008-04-23 13:41:05 +03:00
Uoti Urpala f894294bae vo_xv: Free resources in error cases
If preinit() failed after allocating some resources it didn't free
them. Also if preinit() completed but all (if any) calls to config()
failed then uninit() it not free resources. Add checks to uninit() to
make it safe with only a subset of resources allocated, then make it
execute independently of vo_config_count and also make preinit() call
it in error cases.
2008-04-23 13:41:05 +03:00
Uoti Urpala b91826280c vo_xv.c: Make reconfig logic more robust
The previous version was not buggy, but this is easier to see correct.
Now it doesn't depend on options determining num_buffers staying
constant and on vo_config_count.
2008-04-23 13:41:05 +03:00
Uoti Urpala 461264756e vo_xv.c: remove unnecessary #ifdefs and static vars
Combine code unnecessarily split in 3 #ifdef blocks into one block and
change local variables there were pointlessly declared static to
normal ones.

After this vo_xv.c no longer defines any global or static variables.
2008-04-23 13:41:04 +03:00
Uoti Urpala 1756771e51 vo_xv.c: Cosmetic changes
Remove an unnecessary inner scope in a function and separate 'i' loop
counter variable declared in it, reindent.
2008-04-23 13:41:04 +03:00
Uoti Urpala ef874e0f4c Change vo_xv to use new VO API 2008-04-23 13:41:04 +03:00
Uoti Urpala e5e8effca8 Add a context argument to mp_input_add_event_fd callback 2008-04-23 13:41:04 +03:00
Uoti Urpala 1f086d4376 input/input.c: Minor simplification 2008-04-23 13:41:04 +03:00
Uoti Urpala 4176d5b183 vo_xv.c: Remove #if 0 code 2008-04-23 13:41:04 +03:00
Uoti Urpala 8716df2a41 Add context variable to vo_draw_text callback
Add a context variable and rename the function to osd_draw_text. Create
a new vo_draw_text that is a wrapper for VOs using old API.
2008-04-23 13:41:04 +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
Uoti Urpala 3bb140d847 video_out.c: Cosmetic changes
Reformat some code, rename local variable, remove trailing whitespace.
2008-04-23 13:41:03 +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
attila 530df550e4 revert commits 26437-26439
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26468 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:58:01 +00:00
diego 7c76c4a6f6 Add dependency information to recursive rules. While more eager than strictly
necessary, this should err on the side of unneeded recursion instead of
missing a necessary rebuild.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26467 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:53:42 +00:00
diego 883033e8e3 Add missing recursive rule for libmpcodecs/libmpencoders.a.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26466 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:44:48 +00:00
diego 8c791b38fa cosmetics: Sort recursive rules alphabetically.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26465 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 09:43:53 +00:00
diego 9818a95c58 per-file dependencies (for the non-recursive parts)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26464 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 22:49:17 +00:00
diego 3f37dff367 Adjust dependency generation prerequisites to new structure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26463 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 21:47:51 +00:00
diego a725babf25 Always generate dependency information. This also allows dropping the
hackish list of incorrect pseudo-dependencies.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26462 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 21:46:52 +00:00
ptt 592566cabb synced with r26460
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26461 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 17:26:00 +00:00
ptt d91c119677 restore options alphabetical order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26460 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 17:24:49 +00:00
diego bf2814fdf4 Mark phony targets as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26459 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 08:13:00 +00:00
diego 338b1e9eeb Simplify phony target declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26458 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 08:12:41 +00:00
diego 6187c8753b 10l: Rename remaining instances of $i to $lang.
patch by Andrew Savchenko, Bircoph list ru


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26457 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-18 07:16:22 +00:00
diego 70dd60b8cd cosmetics: __asm__ __volatile__ --> asm volatile
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26456 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-17 21:54:43 +00:00
reimar 11b4999712 Prefer libavformat musepack demuxer over internal one (which does not even support v8).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26455 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-16 12:03:34 +00:00
albeu a2728034c9 noconfig fix, disable_gui_conf was not defined when compiling mencoder.
Fix mencoder linking when the GUI is enabled.
Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26454 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-15 13:20:15 +00:00
corey c206a31228 typo: crahes --> crashes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26453 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-15 02:02:29 +00:00
corey cb5bfc00b2 Refer to where encoding quality is described.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26452 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-15 01:51:43 +00:00
corey 56e672949e As of r19025, the "above link" refers to an article, not a guide.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26451 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-15 01:40:38 +00:00
albeu db3ca5062a Fix the indentation after the noconfig patch.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26450 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:24:24 +00:00
albeu 84bc10acb9 10L, forgot to commit the documentation for the -noconfig options.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26449 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:23:18 +00:00
albeu 6e62b3a85f Add options to disable some or all config files.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:21:29 +00:00
albeu c439e8b468 Add support for system wide config file in mencoder.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26447 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:05:52 +00:00
uau c9e6af5949 demux_asf: Fix operator precedence in packet length check
Change (len & 3-1) to correct ((len & 3) - 1) in packet length check.
Also change "a - 1 < b" to simpler "a <= b".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26446 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 23:04:07 +00:00
diego 93699de705 Add libpostproc to list of pseudo-dependencies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26445 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 22:57:47 +00:00
diego 8dd605f5e4 Declare all clean targets phony in mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26444 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:23:27 +00:00
diego b099ea9c85 The TAGS and tags targets are not phony.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26443 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 21:21:42 +00:00