Commit Graph
21257 Commits
Author SHA1 Message Date
diego 087be5dfd1 Remove config.h, there are multiple files under that name, inviting bugs and
confusion.  This file only contained two definitions, one commented out, the
other never activated.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21272 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 15:42:38 +00:00
gpoirier ba87e8169c sync w/ r21255 (improved deadzone desc.)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21271 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 15:29:40 +00:00
reimar 4e7dedf315 -lwinmm is always (also for mencoder) needed on windows for osdep/timer-win2.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21270 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 14:13:39 +00:00
reimar 0ac20ca8ed Disable when HAVE_SYS_MMAN_H is not defined, since it can not be compiled then.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21269 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:55:55 +00:00
reimar 3e1a24ac55 Adjust icon path since windres is now called from osdep subdir
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21268 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:54:23 +00:00
reimar 690fb7a8e1 Fix incorrect use of be2me_32 on a pointer, use BE_32 instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21267 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:26:21 +00:00
reimar 329ba64c0a le2me_32 is no longer a macro on PPC, and in general does not have to
be, thus using it like a constant is incorrect.
Move wavhdr initialization to the code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21266 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:19:32 +00:00
uau a5ddf3c531 Revert r21251 (moving loader/config.h contents to main config.h).
There are #ifdef TRACE tests in libav* and defining TRACE in toplevel
config.h breaks things.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21265 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:17:50 +00:00
reimar 7142e36d1f Remove useless fd parameter for mmap_anon
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21264 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:09:46 +00:00
diego c95db8d583 Simplify, remove useless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:04:14 +00:00
reimar 7d6341459a Fix loader code: closed .dll file handles when it should not
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21262 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:02:02 +00:00
voroshil 5c404f12f4 r21186: Remove "OSD only" tags; those options always exist.
r21221: improve description of x264's deadzone* options
r21228: fix typos noticed by Diego
r21254: nits and picks by The Wanderer :)
r21255: typo in deadzone_inter


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21261 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:01:09 +00:00
reimar 04459fd6a3 open /dev/zero left over from mmap_anon patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21260 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 12:55:09 +00:00
reimar e85f73f7fb Useless use of strstr, strchr is good enough.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21259 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 12:12:46 +00:00
henry e56c8ee2d0 Check the log level before processing the message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21258 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 12:08:40 +00:00
nicodvb 30155960a4 match exactly card number N specified, rather than the N-th actually usable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21257 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 12:03:23 +00:00
reimar 0fe6e9fbd2 Set _win32codecsdir fallback also with --enable-win32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21256 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 11:56:54 +00:00
lorenm 2417b2e570 typo in deadzone_inter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21255 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 01:25:50 +00:00
gpoirier f6fe9826b6 nits and picks by The Wanderer :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21254 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 00:53:16 +00:00
reimar a32cb8df50 Sanity-check number of lines in CC subtitle
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21253 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 22:18:40 +00:00
reimar 53ba4dd6eb Cleanup for uselessly complicated closed-caption subtitle handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 22:06:00 +00:00
diego 33d70768f9 Move contents of loader/config.h to configure/config.h, there are
multiple files by that name, this can cause problems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21251 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 20:53:43 +00:00
uau 215b64156b Add a sanity check to unsafe-looking code.
Does the memcpy to internal buffer here have any purpose besides
enabling more potential buffer overflows?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21250 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 20:01:24 +00:00
diego 5572645334 Remove config.h and move its content to af.h. There are multiple files under
the name config.h, inviting bugs and confusion.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21249 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 19:57:31 +00:00
diego 8069102bca Use the real name of the header file when guarding against double inclusion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21248 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 19:41:52 +00:00
diego 975a1422fa Remove nonexistent variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21247 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 19:19:36 +00:00
diego c9eeb17112 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21246 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 19:15:23 +00:00
diego 917d57bc25 Don't compile libvo.a unless MPlayer is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21245 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:56:00 +00:00
diego 7cce9019a7 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21244 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:45:03 +00:00
diego 9b56c962e7 Rename Gui/mplayer/mplayer.h to gmplayer.h, another file named mplayer.h
already exists, both get included at the same time in some files...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21243 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:37:37 +00:00
reimar 18d719d7f5 Reuse bswap.h from libavutil. Will only work when libavutil subdir is available.
Applied at Diego's request.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21242 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:30:44 +00:00
diego 838f55e20b Linking hotfix, loader depends on osdep.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21241 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:24:58 +00:00
reimar 2c847e0b06 Remove useless libvo/sub.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21240 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:20:09 +00:00
reimar 3b0e10aee2 Add support for compiling with ICC 9.1. Currently needs --target=generic-linux,
since ICC does not (properly) support __attribute__((used)), even though
the documentation claims otherwise.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21239 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 18:00:59 +00:00
diego eee40df587 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:58:43 +00:00
reimar 8845289943 Add generic target that allow compiling without any assembler or otherwise
architecture specific code (except endiannes of course).
Usage example: ./configure --target=generic-linux


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21237 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:58:33 +00:00
ben badde75862 missing include for uint16_t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21236 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:58:14 +00:00
ben 1e30c2e5ae keep nav highlight event in dvdnav priv structure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:44:22 +00:00
diego 293c11d3b2 There are no more .depend files in subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21234 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:31:07 +00:00
diego 0507f7f35a simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21233 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:16:21 +00:00
diego d487e055fd Remove commented-out cruft.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21232 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:14:31 +00:00
diego 377db6bc69 Unconditionally include config.mak for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21231 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:11:48 +00:00
diego 7b4015bf3b more consistency with the other Makefiles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21230 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:09:25 +00:00
diego 8f167fc5c5 SRCS should be one per line to make patches more readable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21229 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:06:08 +00:00
gpoirier a92b1fd6a0 fix typos noticed by Diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21228 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:03:12 +00:00
diego b0e412cc9c Remove pointless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21227 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 17:02:52 +00:00
diego d55ba3f046 Sync with FFmpeg r7167.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21226 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:55:02 +00:00
diego e2d12a60b4 FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21225 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:49:29 +00:00
diego e912584ae0 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21224 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:14:01 +00:00
diego c30bfbe384 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21223 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:13:26 +00:00