1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-15 03:15:52 +00:00
Commit Graph

26150 Commits

Author SHA1 Message Date
diego
272c3cef90 Add some more paths to find tools on Slackware 12.
based on a patch by andrew, andrew.david.45 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26181 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 08:52:22 +00:00
diego
bcf021b76e Fix printf format string mismatch, eliminates the warning:
ve_vfw.c:252: warning: format '%d' expects type 'int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26180 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 08:43:20 +00:00
diego
db85806a9c Add necessary header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26179 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 08:34:50 +00:00
uau
a0a5afc0c5 ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.

I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26178 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 01:57:26 +00:00
diego
edc39ca57e Disable S3 VIDIX driver on non-x86 platforms.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26177 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 00:42:24 +00:00
diego
d6662d9e78 10l: ENABLE_GRAY needs to be present for libavcodec to compile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26176 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 00:34:40 +00:00
diego
67d7fb2015 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26175 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 23:32:01 +00:00
diego
5d3c5c26f6 Do not enable grayscale decoding in FFmpeg, it slows down the
default (color) case.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26174 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 23:04:27 +00:00
diego
9d6f93f652 Add ENABLE_DECODERS/ENABLE_DEMUXERS alongside CONFIG_DECODERS/CONFIG_DEMUXERS
in config.h. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26173 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 23:03:04 +00:00
reimar
f791cec1b8 Yet another hdv fourcc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26172 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 17:54:36 +00:00
diego
55e29f6103 Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26171 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 08:24:59 +00:00
diego
d5f21cd6cb Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26170 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 08:24:09 +00:00
diego
9e1391b534 Rename url.c/url.h to the less generic gtk_url.c/gtk_url.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26169 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 07:59:37 +00:00
diego
bab8e78a2b Add missing header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26168 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 07:53:14 +00:00
diego
97f140390b consistency cosmetics: Use #ifdef everywhere instead of #if defined().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26167 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 07:52:36 +00:00
michael
fbd3ffa4a0 One more (forgotten) fix for fixing sws_flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26166 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 04:03:44 +00:00
michael
5022909fa8 Turn ancient V offset numerical constants into named ones.
Add a check that checks that the width is within the chosen constant.
This might have been exploitable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26165 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 03:00:25 +00:00
ulion
6b8b2a51e5 Fix ffvorbis decoder's output channel order with channel reordering function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 02:46:50 +00:00
diego
b5ed673f32 Add necessary #includes to pass 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26163 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 23:35:24 +00:00
diego
2a9e515c77 Move duplicated extern declarations of mp_msg_levels and mp_msg_level_all
to cfg-common.h where they are really needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:45:36 +00:00
diego
622540e56f Remove pointless extern keyword from function declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26161 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:14:05 +00:00
diego
2c66b8ea24 #include parser-cfg.h instead of declaring m_config_parse_config_file extern.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26160 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:02:42 +00:00
diego
8375e840a5 Remove pointless extern keyword from function declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26159 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 20:58:25 +00:00
diego
3cd1f73f70 Add comments to #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26158 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:34:56 +00:00
diego
64ab68dc1d Simplify preprocessor conditionals: USE_LIBAV* is defined when compiling
against both shared and static libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:30:35 +00:00
diego
ac491474f1 Remove pointless #ifdef USE_LIBAVCODEC inside #ifdef USE_LIBAVCODEC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26156 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:13:18 +00:00
nicodvb
b867e95584 search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26155 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 22:28:07 +00:00
diego
db9f691b6c Remove ugly workaround for conflicting dca.h headers, it is no longer
necessary now that -I../libavcodec is not in CFLAGS anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:40:39 +00:00
diego
f653e52663 Only demux_lavf.o explicitly needs -I../libavcodec in CFLAGS.
Thus there is no need to use it everywhere.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:37:41 +00:00
diego
b355c3aa67 Add directory names to libavcodec #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26152 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:32:15 +00:00
diego
4ba4e17b71 Remove unnecessary addition of -Ilibavformat to CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26151 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:31:38 +00:00
diego
5d2aa200e8 cosmetics: prettyprinting and alphabetical order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26150 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 18:15:35 +00:00
diego
98669ebdce Move decision about whether or not to compile Windows emulation
infrastructure to configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26149 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 18:12:05 +00:00
diego
e834773166 Move decision about whether or not to compile wrapper.S to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26148 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 17:51:36 +00:00
diego
d47c6f5f32 Add CFLAG_STACKREALIGN unconditionally to win32.o CFLAGS, configure takes care
of setting it only when necessary anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26147 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 17:50:25 +00:00
gpoirier
66e747f5be replace all occurences of "M$" by "Microsoft" because it's what we really meant, and "M$" nickname is quite childish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26146 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 12:38:33 +00:00
diego
4ec85e8560 Add checkheaders target, ported from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26145 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:59:11 +00:00
diego
bc2c5f3f6c Add ID_SEEKABLE information to -identify output.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26144 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:53:18 +00:00
diego
5e6231b340 #include osdep/mman.h if sys/mman.h is not available.
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26143 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 09:47:01 +00:00
uau
2e16b2826a configure: Set CONFIG_ENCODERS=yes in config.mak unconditionally
config.h already had "#define CONFIG_ENCODERS 1" unconditionally, but
the config.mak value depended on whether MEncoder was enabled.
Encoders need to be enabled as some encoder code is used by MPlayer
too. The inconsistent values broke compilation with --disable-mencoder
after libavcodec Makefile made compilation of i386/dsputilenc_mmx.o
depend on the config.mak value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26142 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 03:02:36 +00:00
diego
a27f73390f Revert fixing illegal identifiers to fix compilation on MinGW. Unfortunately
these identifiers appear in Windows system headers and are thus outside our
direct control.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26141 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-02 19:38:50 +00:00
reimar
ae181c92fe Fix comment, qclp fourcc is Qclp not QCLP
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26140 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 20:09:22 +00:00
Gabrov
6ca48a6b2d synced with r26138
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26139 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 12:35:07 +00:00
diego
80104b1757 Fix illegal identifiers starting with _ and capital letters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26138 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:48:29 +00:00
diego
c03c4b5431 Wrap '#include <sys/mman.h>' in HAVE_SYS_MMAN_H.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26137 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:31:51 +00:00
diego
7a5924159c Replace __MINGW32__ preprocessor check with proper HAVE_SYS_MMAN_H check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26136 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 10:16:43 +00:00
diego
edf9dcba6b Remove va_start/vsnprintf workaround for OS/2.
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26135 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:50:06 +00:00
diego
2922e18092 Merge two #ifdefs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26134 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:45:38 +00:00
diego
a09376d67b cosmetics: reindent, detabify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26133 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 09:04:00 +00:00
diego
4485a60c38 Remove duplicate extern declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26132 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-01 08:56:28 +00:00