Commit Graph

31720 Commits

Author SHA1 Message Date
reimar 25b9185f17 Fullscreen support for -vo gl using SDL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31077 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 09:24:30 +00:00
reimar 8b8fd879ac Set SDL window title.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31076 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 08:40:28 +00:00
reimar a83117e972 Window resizing support for -vo gl with SDL backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31075 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 08:35:35 +00:00
reimar 7c2bef4bb5 Add sdl_common file and use it to share the input handling between -vo gl
with SDL backend and -vo sdl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 08:17:23 +00:00
reimar 5cdca55005 Use SDL_GL_ProcAddress to work around conflicts between -lGL
and -framework OpenGL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31073 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 07:32:42 +00:00
reimar 7fc3b782ea Update copyright and email address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31072 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 06:52:13 +00:00
reimar 56af15374b Clarify that the GL_TEXT_FRAGMENT_SHADER_ATI bug workaround is for OSX,
and which versions are known good/known bad.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31071 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-25 06:14:25 +00:00
reimar e9ef1cbda0 Missing gl.h include for SDL backend.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31070 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 22:35:39 +00:00
reimar 37da18aaf9 Slightly more correct ifdefs for vo_gl2.
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
2010-04-24 22:34:38 +00:00
reimar f81cd34fe0 Add workaroound for yuv=7 mode - does hurt speed but not much
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
2010-04-24 22:13:57 +00:00
reimar d5d3c203d3 Remove code to work around bugs in ancient libSDL versions, the code has been
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
2010-04-24 17:15:28 +00:00
reimar ccc269a00a Try harder to find linked OpenGL functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31066 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 17:02:50 +00:00
reimar 5c4cc997ca Disable OSD support by default if the necessary OpenGL functionality is missing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31065 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 16:58:24 +00:00
reimar abfa4e2ae9 SDL support with related crash-resilience fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31064 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 16:52:06 +00:00
reimar 29e713ba4b Some crash-resilience fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31063 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 16:49:46 +00:00
reimar 6e4458ffa3 First steps to support -vo gl with SDL-based Window handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31062 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 16:46:47 +00:00
diego 976d35bc6b 10l: Remove leftover commented-out #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31061 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 10:50:21 +00:00
diego ca555e249f Remove unnecessary kd.h #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31060 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-24 10:47:53 +00:00
Uoti Urpala 7be5f14c3a demux_lavf, stream_ffmpeg: support librtmp seeks 2010-04-23 23:50:34 +03:00
Uoti Urpala 1d4d1bff82 stream_ffmpeg, demux_lavf: Use flv demuxer for rtmp streams
Use lavf's flv demuxer for rtmp/rtmps/... stream types. Letting
generic format probing handle this could work, but with the current
probing implementation it'd at least depend on not-really-guaranteed
details of the stream layer (probing different formats and then
decoding depends on seeking back in between; rtmp streams don't
support such seeking directly so would need to rely on details of
caching behavior).
2010-04-23 22:57:25 +03:00
Uoti Urpala 4583c12a2c options: move lavfdopts to option struct 2010-04-23 22:08:18 +03:00
Uoti Urpala eb48fefe94 stream_ffmpeg.c: change reads back to url_read_complete()
Change reading data from FFmpeg from url_read() back to
url_read_complete(). url_read_complete() behavior has changed in
FFmpeg and no longer returns an error for partial reads at EOF so it's
usable now. Using it is probably not significantly better than
url_read(), but at least it handles EAGAIN.
2010-04-23 21:19:50 +03:00
Uoti Urpala 19907b8fbc demuxer.c: clean up stream-seek code
Only try to use the dvd/dvdnav stream seek hack with those stream
types. Generally demuxers can not be expected to cope with the stream
suddenly seeking under them. In principle it would be more correct to
make the test demuxer-based (instead of assuming that using stream
seeks in this manner is OK with whatever demuxer that will be used
with these streams), but that'd be more work.
2010-04-23 21:01:21 +03:00
Uoti Urpala f9d224b1ad Move some sh_audio field setting out of demuxer.c
These fields are decoder details, not information set by the demuxer.
2010-04-23 20:50:11 +03:00
Uoti Urpala e3bd668ebd Move seek-reset functionality out of demuxer.c
Move code for resetting decoders after seeks, chapter seeks and angle
changes out of demuxer.c. This functionality belongs on a higher
level; the demux layer can't always know what kind of reinitialization
is required.
2010-04-23 20:14:59 +03:00
siretart 9cef48bac7 rename 'struct keymap' -> 'struct mp_keymap'
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
2010-04-23 10:22:44 +00:00
siretart 8bd8aba37a include sys/kd.h on non-Linux architectures correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31058 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-23 10:04:56 +00:00
diego 701bbdfea6 VIDIX only works for Linux on the x86_64 architecture, not on other OSes.
Fixes Debian bug #578622.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31057 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-22 14:02:20 +00:00
diego 02afa9baf4 Merge iopl()-related #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31056 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-22 13:53:13 +00:00
diego b1767fc45e Do not check for __linux__ in a file that is only ever used on Linux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31055 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-22 13:50:25 +00:00
diego a35ab28a5e Revert obscure hack that disables the malloc.h check on certain BSD platforms.
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
2010-04-21 12:43:16 +00:00
reimar f99ec989bc Update comment describing issues with ffaac.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31053 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:25:35 +00:00
reimar 06c6130710 Cosmetics/indentation fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31052 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:24:01 +00:00
reimar 903dedd64f Add workaround for aac-sbr-ffaac-slow.mkv playing to slow with FFmpeg
AAC decoder due to wrong sample rate in container.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31051 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:22:49 +00:00
diego 91a84df7d0 Remove explicit filename from Doxygen @file commands.
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
2010-04-20 14:47:31 +00:00
lorenm c462186142 Tell x264 that we aren't going to give it timestamps.
Fixes some warnings starting in x264-r1480.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 09:14:54 +00:00
diego 9ec5f2f565 Remove unused static function wsDummyEvents and related unused code, fixes:
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
2010-04-20 08:55:04 +00:00
diego 52effc30ed Remove unused static function wsIOErrorHandler, fixes the warning:
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
2010-04-20 08:49:17 +00:00
diego aee3f160e3 Remove unused static function fsFileExist, fixes the warning:
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
2010-04-20 08:44:26 +00:00
zuxy 6fe158d7e7 Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systems
lacking memalign(), e.g. Win32.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 04:33:00 +00:00
jrash 57b5a5cf65 Synced with help_mp-en.h rev. 31032
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31044 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-17 02:19:34 +00:00
jrash ba7ab4fde8 sync with en/mplayer.1 rev. 31028
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31043 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-17 02:14:55 +00:00
diego 7120f1dfba Merge two redundant if checks, patch by ubitux, ubitux gmail com.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31042 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-16 01:42:28 +00:00
diego e903e9eb5e cosmetics: reindent demux_ogg.c to K&R style plus some prettyprinting
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31041 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-16 01:34:32 +00:00
diego 12d6f6b378 Remove commented-out and long-gone dapsync options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31040 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 23:01:06 +00:00
reimar 2c26f9bde0 Mark ffaac as buggy (thus making faad default again) and
document the know issues.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31039 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 18:51:07 +00:00
reimar c0aa5c32b2 Move functions that really do not need to be inlined from the header
to the .c file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 05:39:36 +00:00
cehoyos b768120998 Remove dead code.
Patch by ubitux, ubitux gmail 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31037 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-14 08:53:19 +00:00
reimar 3158a326fe Open cutomtex file in binary mode to avoid potential issues on
Windows.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31036 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-13 05:54:44 +00:00
compn 8a70b9ad85 typo fix found by ubitux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31035 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-13 01:26:20 +00:00