summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move loop_times to option structUoti Urpala2008-04-236-13/+15
|
* Remove pointless #ifdefsUoti Urpala2008-04-232-4/+0
| | | | | These #ifdefs only made MPContext 2 variables smaller when dvbin support was disabled.
* Move mRootWin,mScreen,mLocalDisplay to x11 structUoti Urpala2008-04-233-33/+37
|
* Move vo_mouse_autohide,vo_wm_type,vo_fs_type,vo_fs_flip to x11 structUoti Urpala2008-04-233-30/+29
|
* x11_common: Move vo_old_[x|y|width|height| to x11 structUoti Urpala2008-04-232-18/+19
|
* x11_common.c: Move orig_layer and old_gravity to x11 structUoti Urpala2008-04-232-8/+9
|
* Move static mouse hide timers to x11 structUoti Urpala2008-04-232-12/+11
|
* Move vo_gc,f_gc,vo_hints to x11 structUoti Urpala2008-04-233-63/+64
|
* x11_common.c: Move function-static variables to structUoti Urpala2008-04-232-25/+30
|
* Mark a table constUoti Urpala2008-04-231-1/+1
|
* Move xv_port,xv_colorkey,xv_ck_info to x11 structUoti Urpala2008-04-233-73/+71
|
* Move vo_window to x11 structUoti Urpala2008-04-233-86/+80
|
* Move static X11 atoms to structUoti Urpala2008-04-233-59/+65
|
* Move vo_screenwidth,vo_screenheight to options structUoti Urpala2008-04-239-61/+71
|
* Move vo_depthonscreen to x11 structUoti Urpala2008-04-234-13/+13
|
* Remove vo_depthonscreen references from non-X VOsUoti Urpala2008-04-233-11/+15
| | | | | | | X-specific code uses this global as its internal variable (assuming that X is initialized if it is set). While using non-X VOs the variable is not accessed outside the VO. So make those VOs use their own variables instead of the global vo_depthonscreen.
* Move vo_dbpp to options structUoti Urpala2008-04-235-8/+6
|
* Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo structUoti Urpala2008-04-238-86/+91
|
* Move global vo_config_count to vo structUoti Urpala2008-04-239-34/+38
| | | | | | | | | | | | | | | | | | Remove the global and Add a corresponding field to the vo struct, plus another which tells whether the LAST config call was successful.The latter value which tells whether the VO should be properly configured at the moment seems a better match for the semantics actually needed in most places where the old value was used. The 'count' field with the old semantics is not currently used by anything, but I'm leaving it there for vo drivers which would need those semantics if converted to use the struct. Existing uses of the global outside old vo drivers are either converted to use the struct field or moved inside the vo_xyz() calls (instead of "if (vo_config_count) vo_flip_page(..." just call vo_flip_page which will now do nothing if not configured). The removal of the check in mpcommon.c/update_subtitles() is less trivial than the others, but I think it shouldn't cause problems.
* Move global mDisplay to x11 state structUoti Urpala2008-04-235-197/+228
|
* Create a struct for X11 stateUoti Urpala2008-04-236-5/+24
| | | | | | | | Will be used for common data between X11 VOs. The main reasons for making it a separate struct rather than extra fields in the main VO struct are that some field definitions need X headers and that the code keeps basic X state such as the display connection over opening and closing of individual VOs.
* x11_common.c: Make some functions staticUoti Urpala2008-04-232-15/+8
|
* Allocate vo struct with tallocUoti Urpala2008-04-232-5/+5
| | | | | Also allocate the private vo_xv struct as a child and remove explicit free() for it.
* Makefile: Compile and link talloc.cUoti Urpala2008-04-231-0/+1
|
* Make talloc abort() instead of returning NULLUoti Urpala2008-04-231-9/+9
| | | | | | Replace (hopefully) all cases where normally successful allocations could return NULL with abort(). This should allow skipping most checks on allocation return values.
* Hardcode feature checks in talloc.cUoti Urpala2008-04-231-1/+27
| | | | | | Original talloc build system used autoconf to check for features, most of which were standard C headers. Assume those always exist. Always use a workaround for the one non-standard feature (strnlen).
* Add the talloc memory allocatorUoti Urpala2008-04-232-0/+1907
| | | | | Copy talloc.c and talloc.h from Samba (last changed 2008-04-17 in commit 7b9a647ebbbe9ec9e1b82b42e3a8916396f91273).
* Move vo_ontop to options structUoti Urpala2008-04-2313-24/+60
| | | | | | | | | | | 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.
* vo_gl[2]: Rename conflicting vo_ontop macroUoti Urpala2008-04-233-4/+4
| | | | | | | | 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).
* Add option pointer to vo structUoti Urpala2008-04-233-5/+8
|
* vf.c: malloc+memset -> callocUoti Urpala2008-04-231-2/+1
|
* Move correct_pts to options structUoti Urpala2008-04-2313-25/+38
|
* Add option pointer to vf structUoti Urpala2008-04-236-29/+37
|
* Add option pointer to demuxers and stheader.h structsUoti Urpala2008-04-239-34/+58
|
* Declare demuxer *_streams fields with proper typesUoti Urpala2008-04-233-7/+7
| | | | | | | | 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.
* Move options "vo" and "ao" to common structUoti Urpala2008-04-234-16/+19
|
* Start of new option systemUoti Urpala2008-04-2312-36/+85
| | | | | | | | 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.
* vo_xv: Free resources in error casesUoti Urpala2008-04-231-9/+19
| | | | | | | | | 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.
* vo_xv.c: Make reconfig logic more robustUoti Urpala2008-04-231-7/+6
| | | | | | 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.
* vo_xv.c: remove unnecessary #ifdefs and static varsUoti Urpala2008-04-231-11/+4
| | | | | | | | 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.
* vo_xv.c: Cosmetic changesUoti Urpala2008-04-231-15/+10
| | | | | Remove an unnecessary inner scope in a function and separate 'i' loop counter variable declared in it, reindent.
* Change vo_xv to use new VO APIUoti Urpala2008-04-231-238/+283
|
* Add a context argument to mp_input_add_event_fd callbackUoti Urpala2008-04-234-6/+17
|
* input/input.c: Minor simplificationUoti Urpala2008-04-231-15/+17
|
* vo_xv.c: Remove #if 0 codeUoti Urpala2008-04-231-25/+1
|
* Add context variable to vo_draw_text callbackUoti Urpala2008-04-2310-18/+35
| | | | | 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.
* Add new video driver APIUoti Urpala2008-04-2326-178/+387
| | | | | | | | | | | | | 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.
* video_out.c: Cosmetic changesUoti Urpala2008-04-231-62/+65
| | | | Reformat some code, rename local variable, remove trailing whitespace.
* Remove variable arguments from vo control() functionsUoti Urpala2008-04-2349-51/+50
| | | | | No voctrl uses them any more, and using them would not be a good idea because it makes forwarding arguments to other functions harder.
* Change VOCTRL_[GET|SET]_EQUALIZER argument passingUoti Urpala2008-04-2320-378/+130
| | | | | | | | 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.
* revert commits 26437-26439attila2008-04-191-11/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26468 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add dependency information to recursive rules. While more eager than strictlydiego2008-04-191-22/+22
| | | | | | | | 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
* Add missing recursive rule for libmpcodecs/libmpencoders.a.diego2008-04-191-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26466 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Sort recursive rules alphabetically.diego2008-04-191-27/+27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26465 b3059339-0415-0410-9bf9-f77b7e298cf2
* per-file dependencies (for the non-recursive parts)diego2008-04-182-5/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26464 b3059339-0415-0410-9bf9-f77b7e298cf2
* Adjust dependency generation prerequisites to new structure.diego2008-04-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26463 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always generate dependency information. This also allows dropping thediego2008-04-182-52/+4
| | | | | | | hackish list of incorrect pseudo-dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26462 b3059339-0415-0410-9bf9-f77b7e298cf2
* synced with r26460ptt2008-04-181-2/+40
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26461 b3059339-0415-0410-9bf9-f77b7e298cf2
* restore options alphabetical orderptt2008-04-181-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26460 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark phony targets as such.diego2008-04-181-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26459 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify phony target declaration.diego2008-04-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26458 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Rename remaining instances of $i to $lang.diego2008-04-181-2/+2
| | | | | | | patch by Andrew Savchenko, Bircoph list ru git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26457 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: __asm__ __volatile__ --> asm volatilediego2008-04-171-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26456 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prefer libavformat musepack demuxer over internal one (which does not even ↵reimar2008-04-161-0/+2
| | | | | | support v8). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26455 b3059339-0415-0410-9bf9-f77b7e298cf2
* noconfig fix, disable_gui_conf was not defined when compiling mencoder.albeu2008-04-152-2/+4
| | | | | | | | 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
* typo: crahes --> crashescorey2008-04-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26453 b3059339-0415-0410-9bf9-f77b7e298cf2
* Refer to where encoding quality is described.corey2008-04-151-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26452 b3059339-0415-0410-9bf9-f77b7e298cf2
* As of r19025, the "above link" refers to an article, not a guide.corey2008-04-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26451 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the indentation after the noconfig patch.albeu2008-04-141-7/+7
| | | | | | | Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26450 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10L, forgot to commit the documentation for the -noconfig options.albeu2008-04-141-0/+22
| | | | | | | Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26449 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add options to disable some or all config files.albeu2008-04-147-4/+42
| | | | | | | Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for system wide config file in mencoder.albeu2008-04-141-0/+3
| | | | | | | Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26447 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_asf: Fix operator precedence in packet length checkuau2008-04-131-1/+1
| | | | | | | | 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
* Add libpostproc to list of pseudo-dependencies.diego2008-04-131-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Declare all clean targets phony in mpcommon.mak.diego2008-04-132-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26444 b3059339-0415-0410-9bf9-f77b7e298cf2
* The TAGS and tags targets are not phony.diego2008-04-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26443 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add gui subdirectories to DIRS instead of manually cleaning them.diego2008-04-131-4/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26442 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace shell for loop by proper make foreach construct.diego2008-04-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace the trivial command line preparser with a more robust versionalbeu2008-04-137-13/+67
| | | | | | | allowing all kind of options to be used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26440 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: fix indentationattila2008-04-131-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26439 b3059339-0415-0410-9bf9-f77b7e298cf2
* move the #ifdef HAVE_XINERAMA to enclose the whole functionattila2008-04-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26438 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always calculate the xinerama screen mplayer is on.attila2008-04-131-6/+3
| | | | | | | | Bug reported by thomas.lindroth(<at>)gmail.com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix DEPEND_CMD, there was one level of variable indirection too much.diego2008-04-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26436 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync with latest FFmpeg changes.diego2008-04-132-11/+25
| |