summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Move vo_ontop to options structUoti Urpala2008-04-2310-20/+55
| | | | | | | | | | | 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-232-4/+7
|
* 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-231-2/+4
|
* vo_xv.c: Remove #if 0 codeUoti Urpala2008-04-231-25/+1
|
* Add context variable to vo_draw_text callbackUoti Urpala2008-04-237-12/+29
| | | | | 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-2318-126/+333
| | | | | | | | | | | | | 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-2319-376/+126
| | | | | | | | 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
* 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
* Replace "all rights reserved" statement with standard GPL license header.diego2008-04-131-5/+16
| | | | | | | Done with the permission of Andreas Ackermann, the author of the file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26432 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove -I CFLAGS hack, -I../libavcodec is no longer in CFLAGS.diego2008-04-091-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26372 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix nonsensical license header, mpeg2dec is not GNU Make.diego2008-04-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26361 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change I_TYPE -> FF_I_TYPE to fix compilation.reimar2008-04-031-1/+1
| | | | | | | The whole functionality should probably be used to libavcodec though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26322 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use __AMIGAOS4__ instead of AMIGA, like everywhere else.diego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a separate definition for quartz.diego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26245 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use __APPLE__ instead of MACOSX as preprocessor condition.diego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26243 b3059339-0415-0410-9bf9-f77b7e298cf2
* MACOSX_COREVIDEO --> corevideodiego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26241 b3059339-0415-0410-9bf9-f77b7e298cf2
* #include config.h before all other headers.diego2008-03-145-9/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix and simplify lscale=2 (bicub_x) scaler, produced funnyreimar2008-03-121-7/+7
| | | | | | | noise on ATI cards due to cdelta.y never being set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26227 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix wrong check for vidix usage.iive2008-03-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26206 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't use void * arithmetic.iive2008-03-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26205 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle vga_init() error and output error message.iive2008-03-091-3/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26204 b3059339-0415-0410-9bf9-f77b7e298cf2
* This header uses parts of stdint.h, so #include it.diego2008-03-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26195 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-076-0/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26194 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary #ifdef nesting.diego2008-03-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26192 b3059339-0415-0410-9bf9-f77b7e298cf2
* Wrap '#include <sys/mman.h>' in HAVE_SYS_MMAN_H.diego2008-03-011-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26137 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-2218-55/+54
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing multiple inclusion guards.diego2008-02-211-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26044 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use filename as multiple inclusion guard.diego2008-02-211-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26043 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.diego2008-02-203-40/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo: change asm syntax to use ASMALIGN and " # nop"uau2008-02-152-5/+5
| | | | | | | | | Change ".balign 16\n\t" to ASMALIGN(4) and "/nop" to " # nop". The new version is what other code in MPlayer uses, and works with old assembler versions like that used on OS X. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26005 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert accidentially committed line of r25994.cehoyos2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25995 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-149-16/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try harder to find OpenGL functions on Windows.reimar2008-02-111-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Slightly document alpha for OSD colorreimar2008-02-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25984 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support alpha for vo gl osdcolorreimar2008-02-111-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25983 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove an extern for a variable that no longer existsreimar2008-02-111-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25982 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove left-over extern definitions that should not be therereimar2008-02-111-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25981 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make some variables static.reimar2008-02-101-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a useless extra pointer variable.reimar2008-02-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25977 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not uselessly erase background, OpenGL will take care of drawing everything.reimar2008-02-101-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25976 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid -wid message processing blocking MPlayer.reimar2008-02-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25974 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forward mouse messages to -wid Window.reimar2008-02-101-1/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25972 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure the -wid window does not get notified when we destroy our attached ↵reimar2008-02-091-1/+1
| | | | | | | | | child window. Previous behaviour seems to cause QT to do something stupid which makes DestroyWindow hang (SMPlayer is an application where this happened). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25966 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack: Create a child window for Windows OpenGL with -wid, since (esp. nVidia)reimar2008-02-091-8/+10
| | | | | | drivers have problems drawing in other processes' windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25965 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add aspect_fit declaration missing for w32_common.reimar2008-02-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25959 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement keepaspect for Windows OpenGL vos.reimar2008-02-021-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25950 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make aspect adjustment calculation simpler and more flexible.reimar2008-02-021-24/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25949 b3059339-0415-0410-9bf9-f77b7e298cf2
* Redraw display on toggling borderreimar2008-02-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25944 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always redraw video on resize.reimar2008-01-311-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25943 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a MANGLE, there is no register pressure and the generated codereimar2008-01-302-3/+3
| | | | | | | should be no worse. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25935 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow for larger fragment programs.reimar2008-01-291-3/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25913 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use uppercase filename as multiple inclusion guard.diego2008-01-281-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix illegal identifiers, names starting with __ are reserved for the system.diego2008-01-271-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25889 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow independent scaling of vo_font and sub_font.reimar2008-01-273-14/+14
| | | | | | | Patch by Guillaume LECERF (foxcore gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a few const attributesreimar2008-01-231-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25838 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid some pointer conversion warnings (the code is messy but not wrong)reimar2008-01-201-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25815 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing vo_w32_border prototypereimar2008-01-201-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25814 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some function types from unspecified to empty argument listreimar2008-01-201-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25813 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant declarations (already in video_out.h)reimar2008-01-201-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25812 b3059339-0415-0410-9bf9-f77b7e298cf2
* -panscan should also work for right and left bordersreimar2008-01-191-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25810 b3059339-0415-0410-9bf9-f77b7e298cf2
* Some reindentationreimar2008-01-191-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25809 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a coefficient for lscale=5 OpenGL modereimar2008-01-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25797 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warning:reimar2008-01-191-1/+1
| | | | | | | vo_directfb2.c:553: warning: passing argument 2 of ‘dfb->EnumVideoModes’ from incompatible pointer type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25792 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid void* arithmeticreimar2008-01-191-15/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25791 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify and silence lots of warningsreimar2008-01-191-29/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25790 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix using both lscale and cscale 4reimar2008-01-191-15/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25788 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a fragment program for 5x5 unsharp maskingreimar2008-01-182-0/+35
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25786 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove leftover backslashreimar2008-01-18