summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r31097Uoti Urpala2010-04-2630-278/+627
|\
| * synced with r31096Gabrov2010-04-259-40/+218
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * typo fixesGabrov2010-04-251-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31096 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set vo_dwidth/vo_dheight for mouse movements work at least in windowed mode.reimar2010-04-251-0/+2
| | | | | | | | | | | | | | For fullscreen, vo_screenwidth/vo_screenheight have to be set correctly still. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31095 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try other methods also if GetBusKey fails instead of failing completely.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Missing space after if.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31093 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support mouse movements in SDL.reimar2010-04-251-1/+4
| | | | | | | | | | | | | | Currently for some reason broken with -vo sdl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31092 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid duplicating mouse-movement command-generation code.reimar2010-04-255-17/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31091 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix crash if a DVD is played with dvdnav:// and without videoreimar2010-04-251-1/+2
| | | | | | | | | | | | | | (e.g. because vo initialization failed). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31090 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Deduplicate enable_mouse_movements declaration.reimar2010-04-254-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31089 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Minor cosmetics.reimar2010-04-251-7/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31088 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add comment for endif.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31087 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support for auto-selecting the OpenGL backend.reimar2010-04-253-7/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31086 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add reinitialization support. Necessary for fullscreen on OSX.reimar2010-04-254-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31085 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle SDL expose events with -vo gl.reimar2010-04-251-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31084 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Missing space in error message.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31083 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify SDL key symbol mapping.reimar2010-04-251-48/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31082 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the proper define for translating the tab key.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31081 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make uppercase characters and in general all ASCII characters workreimar2010-04-251-12/+5
| | | | | | | | | | | | | | properly with SDL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Share SDL initialization code.reimar2010-04-254-20/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31079 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary check.reimar2010-04-251-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31078 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fullscreen support for -vo gl using SDL.reimar2010-04-253-1/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set SDL window title.reimar2010-04-251-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Window resizing support for -vo gl with SDL backend.reimar2010-04-254-7/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add sdl_common file and use it to share the input handling between -vo glreimar2010-04-255-84/+161
| | | | | | | | | | | | | | with SDL backend and -vo sdl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use SDL_GL_ProcAddress to work around conflicts between -lGLreimar2010-04-251-0/+10
| | | | | | | | | | | | | | and -framework OpenGL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31073 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update copyright and email address.reimar2010-04-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Clarify that the GL_TEXT_FRAGMENT_SHADER_ATI bug workaround is for OSX,reimar2010-04-251-3/+3
| | | | | | | | | | | | | | and which versions are known good/known bad. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31071 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Missing gl.h include for SDL backend.reimar2010-04-241-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31070 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly more correct ifdefs for vo_gl2.reimar2010-04-241-6/+9
| | | | | | | | | | | | | | Compiling with both win32 and x11 backend still will not work though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31069 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add workaroound for yuv=7 mode - does hurt speed but not muchreimar2010-04-241-1/+5
| | | | | | | | | | | | | | and this code should only be used when it is the only option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31068 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove code to work around bugs in ancient libSDL versions, the code has beenreimar2010-04-242-44/+0
| | | | | | | | | | | | | | accidentally disabled since some time and there were no complaints. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31067 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try harder to find linked OpenGL functions.reimar2010-04-241-27/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31066 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable OSD support by default if the necessary OpenGL functionality is missing.reimar2010-04-241-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31065 b3059339-0415-0410-9bf9-f77b7e298cf2
| * SDL support with related crash-resilience fixes.reimar2010-04-241-4/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31064 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some crash-resilience fixes.reimar2010-04-241-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31063 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First steps to support -vo gl with SDL-based Window handling.reimar2010-04-242-0/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31062 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Remove leftover commented-out #include.diego2010-04-241-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31061 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary kd.h #include.diego2010-04-241-6/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31060 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename 'struct keymap' -> 'struct mp_keymap'siretart2010-04-236-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the compilation failure on kFreeBSD (at least amd64): In file included from libvo/vo_directfb2.c:44: libvo/video_out.h:267: error: redefinition of 'struct keymap' This is because libvo/vo_directfb2.c #includes sys/kd.h, which in turn includes sys/kbio.h, which defines another 'struct keymap'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31059 b3059339-0415-0410-9bf9-f77b7e298cf2
| * include sys/kd.h on non-Linux architectures correctlysiretart2010-04-231-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31058 b3059339-0415-0410-9bf9-f77b7e298cf2
| * VIDIX only works for Linux on the x86_64 architecture, not on other OSes.diego2010-04-221-1/+1
| | | | | | | | | | | | | | Fixes Debian bug #578622. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31057 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge iopl()-related #ifdefs.diego2010-04-221-5/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31056 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not check for __linux__ in a file that is only ever used on Linux.diego2010-04-221-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31055 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert obscure hack that disables the malloc.h check on certain BSD platforms.diego2010-04-211-2/+0
| | | | | | | | | | | | | | | | | | | | It's unclear what disabling the result of the check is good for and why it is necessary. Just avoiding a warning is not a good enough reason. Furthermore this hack introduces problems on 64 bit (k)FreeBSD, as reported in Debian bug #578622, which indicates it might never have been a good idea at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31054 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update comment describing issues with ffaac.reimar2010-04-201-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31053 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Skip svn changes r30151, r30152Uoti Urpala2010-04-260-0/+0
|\| | | | | | | | | | | The functionality equivalent was already done last month in git (plus the svn commit has a misleading MSGL_WARN message that shouldn't be there).
| * Cosmetics/indentation fixes.reimar2010-04-201-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31052 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add workaround for aac-sbr-ffaac-slow.mkv playing to slow with FFmpegreimar2010-04-201-0/+5
| | | | | | | | | | | | | | AAC decoder due to wrong sample rate in container. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31051 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31050Uoti Urpala2010-04-2610-1379/+1463
|\|
| * Remove explicit filename from Doxygen @file commands.diego2010-04-201-1/+1
| | | | | | | | | | | | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31050 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Tell x264 that we aren't going to give it timestamps.lorenm2010-04-202-1/+2
| | | | | | | | | | | | | | Fixes some warnings starting in x264-r1480. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused static function wsDummyEvents and related unused code, fixes:diego2010-04-201-14/+0
| | | | | | | | | | | | | | gui/wm/ws.c:710: warning: 'wsDummyEvents' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31048 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused static function wsIOErrorHandler, fixes the warning:diego2010-04-201-6/+0
| | | | | | | | | | | | | | gui/wm/ws.c:184: warning: 'wsIOErrorHandler' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31047 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused static function fsFileExist, fixes the warning:diego2010-04-201-8/+0
| | | | | | | | | | | | | | gui/mplayer/gtk/fs.c:440: warning: 'fsFileExist' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31046 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systemszuxy2010-04-206-17/+21
| | | | | | | | | | | | | | lacking memalign(), e.g. Win32. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Synced with help_mp-en.h rev. 31032jrash2010-04-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31044 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 rev. 31028jrash2010-04-171-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31043 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge two redundant if checks, patch by ubitux, ubitux gmail com.diego2010-04-161-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31042 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: reindent demux_ogg.c to K&R style plus some prettyprintingdiego2010-04-161-1360/+1438
| | | | | | | | | | | | | | patch by ubitux, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31041 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31040Uoti Urpala2010-04-266-116/+113
|\|
| * Remove commented-out and long-gone dapsync options.diego2010-04-151-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31040 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark ffaac as buggy (thus making faad default again) andreimar2010-04-151-1/+3
| | | | | | | | | | | | | | document the know issues. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31039 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move functions that really do not need to be inlined from the headerreimar2010-04-152-105/+108
| | | | | | | | | | | | | | to the .c file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2 </