1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-22 07:46:55 +00:00
Commit Graph

30975 Commits

Author SHA1 Message Date
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
cehoyos
1468d39b01 Do not try -march=native for icc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30984 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 10:13:08 +00:00
reimar
fd6ce85192 Change type to uint8_t to avoid checks depending on char signedness.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30983 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-02 07:14:21 +00:00
ptt
a300074bd2 updated example line for encoding to psp (acodec faac is now libfaac)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30982 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-01 17:37:51 +00:00
ptt
fa1069902c updated table of libavcodec's audio codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30981 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-01 17:37:13 +00:00
reimar
006c481c1e Sanitize ICY metadata a bit before printing it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30980 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 19:42:15 +00:00
reimar
c800858e60 Make audio switching with AVI demuxer chose the first audio stream
if audio is disabled instead of ignoring the request.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30979 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 18:45:00 +00:00
reimar
e969acde38 Replace some "m" constraints by MANGLE to avoid issues with some compilers not
being able to compile it and deduplicate the code at the same time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30978 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 17:00:33 +00:00
attila
0b37836e8c rename eatgv -> ffeatgv, lpcm -> fflpcm
for consitently naming all ffmpeg codecs

requested by compn


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30977 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 06:33:08 +00:00
diego
ceaa91f0a1 Add HAVE_STRERROR_R definition for FFmpeg to config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30976 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 19:02:58 +00:00
diego
86641ee41e Use (void) instead of () to indicate a parameterless function, fixes:
libvo/vo_xvmc.c:123: warning: function declaration isn't a prototype


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30975 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 16:58:27 +00:00
diego
a7b500e6ff Add definition of CONFIG_LIBRTMP to config.h for FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30974 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 16:49:23 +00:00
reimar
7a82111f82 Fix compilation after librtmp support in FFmpeg.
Should be replaced by a proper configure check for librtmp later.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30973 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 16:31:17 +00:00
reimar
91ec3ae682 Fix crash with incomplete yuv2 frames.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30972 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 00:08:28 +00:00
reimar
55089a3986 Leave disabling SSE to the check_os_katmai_support always regardless of OS,
it can already handle all cases, will always print a proper warning and
probably fixes SSE being disabled on x86_64 Solaris systems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30971 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 19:45:59 +00:00
reimar
67dcbed681 Support concatenated YUV4MPEG files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30970 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 16:01:22 +00:00
reimar
ce67a0caf7 Use calloc instead of malloc+memset
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30969 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 15:35:59 +00:00
reimar
1641daf014 Add const to some video_out extern declarations to match their definitions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30968 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 15:27:16 +00:00
reimar
38abe6ff7a Mark some more LIBVO_EXTERN declarations as const where possible.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30967 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-27 15:22:47 +00:00