Commit Graph

30993 Commits

Author SHA1 Message Date
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
reimar 475a831ac8 Fix width/height mixup in error message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31009 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 19:38:47 +00:00
diego ce1ade971d Remove -O4 from FAAC check, it is in our standard CFLAGS already.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31008 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 17:57:00 +00:00
diego cc30ded639 Directly use CFLAGS for ASFLAGS instead of duplicating the variable content.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31007 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 17:18:47 +00:00
reimar b8a7ed8a79 Factor out the YUV->RGB conversion auto-selection and also
enable auto-selection of ATI fragment shaders since they
should do accurate conversions now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31006 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:56:30 +00:00
diego ad26195a80 cosmetics: prettyprint config.mak somewhat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31005 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:48:46 +00:00
diego 00959d5cf7 Remove no longer necessary CONFIG_SWSCALE from config.h/config.mak.
FFmpeg now builds with the software scaler enabled by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31004 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:32:54 +00:00
diego 275efd21b1 Mark parameterless function declarations as (void). Fixes the warnings:
loader/wine/msacm.h:693: warning: function declaration isn't a prototype
loader/wine/msacm.h:901: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31003 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:21:07 +00:00
diego 2c7f1f8156 Mark input-related m_option_t arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31002 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:38 +00:00
diego 935147dd64 Mark vf_size_preset_fields m_option_t array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31001 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:08 +00:00
diego 51d72c7764 Mark muxer-related m_option_t arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31000 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:12:23 +00:00
diego 637dd3d064 Mark cfg_fields m_option_t array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30999 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:11:20 +00:00
diego d2d509dc39 Mark dxr2_opts array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30998 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:08:15 +00:00
diego 75fad5bac6 Mark encoder-related m_option_t struct arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:59:09 +00:00
diego f8a9b4e17a Revert marking m_option struct member as const.
It is used for non-const things, so the original change was wrong.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30996 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:57:17 +00:00
reimar 22f6170009 Share more code between the two ATI fragment shader YUV to RGB
conversion methods and extend them to support more accurate
conversion (though at the cost of some speed).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30995 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 11:45:05 +00:00
reimar 4a8486f844 Try to detect and work around broken glXGetProcAddress on at
least PPC OS X 10.4.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30994 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 20:31:03 +00:00
reimar 269b96d75e Implement OpenGL-based YUV to RGB version for Radeon 9200 class
cards on OS X.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30993 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 19:58:06 +00:00
diego c7cdd996f5 Remove commented-out #include of a non-existing file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30992 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:40:08 +00:00
diego ff93cd656b Add a header for x264enc_set_param() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
diego 8b4b82d008 Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.
The file is only compiled if that condition is true.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 13:51:14 +00:00
diego e7a1dbc122 Mark m_option struct member as const.
This fixes many warnings similar to:
cfg-mplayer.h:368: warning: initialization discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30989 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 11:06:57 +00:00
reimar 0c6b8880ce Indentation fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30988 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 07:12:32 +00:00
reimar 2cebf8eeb7 Add mpgl prefix to all OpenGL-related function pointers.
This is necessary because at least the GetString symbol
causes clashes on PPC OSX 10.4, causing -vo gl to always
crash.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30987 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 07:08:07 +00:00
attila 0a49e5e96c dont mention base64 about sending attachments.
this may (and has) confused people, beside
that 99.9% of all MUA will do the right thing
here anyways.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30986 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 17:29:22 +00:00
cehoyos 103ca0c902 Cosmetics: Fix indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30985 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 10:13:45 +00:00