RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-04 05:52:09 +00:00
Code Issues Releases Wiki Activity
31,018 Commits 41 Branches 86 Tags 153 MiB
9cef48bac7
Commit Graph

31018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
reimar
026fb91615 Make ASS processing work with both subtitle formats, the MKV one and the 
"standard" one FFmpeg uses.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31034 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-12 21:04:17 +00:00
iive
e16f02fe40 Fix build due to FFmpeg r22858 change (function rename). 
Patch by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31033 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-12 20:03:26 +00:00
diego
7573c29480 the great MPlayer tab removal: part I 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31032 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-12 10:56:17 +00:00
diego
86ea8d4f4a Fix build after FFmpeg symbol rename: 
ff_eval2      --> ff_parse_and_eval_expr
ff_parse_eval --> ff_eval_expr
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31031 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-12 08:03:39 +00:00
cehoyos
40ac0d3109 Add slave commands for loading and unloading audio filters at runtime. 
Patch by Jehan Hysseo, hysseo zemarmot net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31030 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-11 18:59:19 +00:00
iive
e3ed371d51 Fix build due to FFmpeg r22833 change (typedef rename). 
Found by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31029 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-11 13:47:13 +00:00
cehoyos
543504363f Add osd_show_progression: Show progress bar and elapsed/total time. 
Patch by Hugo Chargois, hugo D chargois A free fr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31028 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-09 19:20:52 +00:00
reimar
8305385bb7 Add some fallback OpenGL defines to fix compilation on Windows. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31027 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-07 19:36:23 +00:00
diego
d226b09b2c Generate dependency information as a sideeffect of compilation. 
This speeds up compilation times, simplifies the code and
fixes dependency file generation in libav*.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31026 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-06 10:08:19 +00:00
diego
9ceb70782b cosmetics: Reorder some x86-related preprocessor conditionals. 
This fixes two of the following warnings on non-x86 machines:
libmpcodecs/vf_gradfun.c:388:5: warning: "HAVE_EBX_AVAILABLE" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31025 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-06 09:46:47 +00:00
reimar
7e8bfbef4b Do not print the "Loading cookie file" message twice. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31024 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 19:35:35 +00:00
reimar
d62bef6ee5 Try to fix VCD compilation on non-Linux systems. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31023 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 19:31:55 +00:00
diego
151e497922 Add -MP to dependency command. 
This should avoid issues with make stalling after header files
have been renamed or removed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31022 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 17:15:08 +00:00
diego
093e1cb672 Drop unused DEPEND_CMD from config.mak; FFmpeg no longer needs it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31021 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 17:11:58 +00:00
reimar
7bf961b1a3 Remove unused functions. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31020 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 16:42:52 +00:00
reimar
9521c190c3 Export VCD tracks as chapters, just like for cue:// URLs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31019 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 16:40:04 +00:00
reimar
d55c67d157 Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code, 
not around MMX code etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31018 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 16:38:40 +00:00
diego
bafe08d111 VBlankActiveFunc is a pointer to a parameterless function; mark it as such. 
This fixes the warning:
vidix/sis_vid.c:96: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31017 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 15:58:38 +00:00
reimar
a55acacbda Fix RGB support for corevideo: corevideo can only support 
ARGB and BGRA, which depending on endianness matches only one
of RGB32 and BGR32.
Also add RGB24 support which works independent of endianness,


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31016 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 13:11:06 +00:00
reimar
c0b8b92d99 Enable OSD also for BGR32, the code is the same as for RGB32. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31015 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 07:22:21 +00:00
reimar
a8a98ee6d1 Implement VOCTRL_DRAW_IMAGE instead of the deprecated draw_frame, avoiding 
an extra memcpy in case of stride mismatch.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31014 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-05 07:15:22 +00:00
reimar
e6455d7161 Check texture dimensions instead of internal format in max texture 
size check to work around OS X ATI driver bugs:
- does not keep format but use an equivalent one (1 becomes 0x8040).
- does not set to 0 on failure but to 0x8018


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31013 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:56:26 +00:00
reimar
3107620451 Cosmetics/reindent. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31012 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:44:03 +00:00
reimar
1a42a53fd2 Avoid duplicating a condition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31011 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:42:52 +00:00
reimar
5e8cfc7230 Print width before height, 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31010 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-04-04 19:39:54 +00:00