Commit Graph

26671 Commits

Author SHA1 Message Date
Uoti Urpala 13110e92ba vo_macosx: Include header instead of "extern ..." 2008-04-29 14:11:59 +03:00
Uoti Urpala 84f0949416 vo_macosx.m: Fix compilation after recent changes
This .m file had not been updated during other VO changes.
2008-04-29 13:32:58 +03:00
Uoti Urpala 3e389c5284 input.c: Use union instead of void * 2008-04-29 12:58:29 +03:00
Uoti Urpala 986e519fc9 input: Remove separate mp_input_add_event_fd
Use the same mp_input_add_key_fd for all uses and add a context
argument to its callback that was before only in the event fd
callbacks. Instead of checking in input.c whether keys were inserted
to the keypress FIFO during the callback do the check in the callback
before returning and set return value accordingly.
2008-04-29 12:55:23 +03:00
Uoti Urpala b6b82964aa input.c: Revert code uglifications done for gcc 2.95
It's unlikely that this branch will ever compile with gcc 2.95 again,
so it's pointless to keep code uglifications done to work around its
limitations.
2008-04-29 12:24:02 +03:00
Uoti Urpala 5a08b7f96d input.c: Remove unnecessary #include "osdep/getch2.h" 2008-04-29 12:13:20 +03:00
Uoti Urpala c57224ddec Makefile: Fix RECURSIVE_RULE with nested subdirectories
The rule produces dependencies for .a files in subdirectories. After
moving FFmpeg subdirectories under ffmpeg/ "$(part)/$(part).a:" gave
results like "ffmpeg/libavutil/ffmpeg/libavutil.a:". Fix it to produce
"ffmpeg/libavutil/libavutil.a".
2008-04-29 05:39:13 +03:00
Uoti Urpala 06a35804f3 Merge svn changes up to r26587
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
diego 7398abf389 Get rid of now obsolete library rules and variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:34:59 +00:00
diego 71272215d4 cosmetics: Reorder commands in (dist)clean targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:45 +00:00
diego 2c5869a10b Remove '-' prefix from 'rm -f' commands for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 18:12:07 +00:00
diego acf602f12e Mark phony checkheaders target as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26584 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 17:57:44 +00:00
diego 75e96820c4 Merge now redundant clean and distclean rules into the top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 17:54:14 +00:00
ulion d90a7e0283 Force to uint64_t first to avoid direct conversion from double to unsigned int.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26582 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:57:31 +00:00
diego d4f42c4d46 Remove code for .depend generation, inclusion and related hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:42:36 +00:00
diego d73a7beb00 .depend should no longer be ignored.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26580 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:41:30 +00:00
diego 17e278294a Run 'make depend', not 'make .depend' in FFmpeg subdirectories.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:36:00 +00:00
diego d5dfadb697 Remove unnecessary CFLAGS hack.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:20:15 +00:00
diego 2582357923 Remove unnecessary -I.. from CFLAGS, change -I../libavutil to -Ilibavutil.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26577 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 15:19:50 +00:00
diego 0792780cb7 Use consistent #include paths without "../".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:50:24 +00:00
diego df2124e18f Use full path for libavutil #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26575 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:44:10 +00:00
diego 2f690cb652 Consistently #include mpbswap.h instead of bswap.h everywhere.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26574 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:43:30 +00:00
diego 238670ae7c Merge loader/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:01:58 +00:00
Uoti Urpala e1ef11f0f6 font_load_ft.c: Make tables const 2008-04-28 16:38:40 +03:00
diego 928c5fb69d Restore line mistakenly commented out in the last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:31:00 +00:00
diego 558e30b12c Make sure all autogenerated .h and .c files exist in the vidix subdirectory
before trying to create object or dependency files there.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:28:36 +00:00
diego 9a885b71aa Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwards
anyway. The calls were missing parameters and caused compilation failures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:07:01 +00:00
diego 09e2855266 Add missing ldt_keeper.h #include; this fixes a bunch of implicit declaration
of function warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26569 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:05:25 +00:00
diego ac3e5f24e9 Merge TEST_OBJS and TEST_LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26568 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:41:39 +00:00
diego a3cef8cd25 Add -g to CFLAGS, not to LDFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26567 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:39:15 +00:00
diego 944489b835 Merge test program compilation rules using patterns.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26566 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:35:20 +00:00
diego 305dfe091f Add CFLAGS to test program compilation commands.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26565 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:34:30 +00:00
diego 181b0a7a46 Add missing ../osdep/mmap_anon.o to TEST_OBJS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26564 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:32:23 +00:00
diego e59cb06784 Remove unnecessary linker flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26563 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:31:24 +00:00
diego 35649cad4a Add missing #include, fixes the warning:
qtx/qtxload.c:50: warning: implicit declaration of function 'mp_msg_init'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26562 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:03:52 +00:00
diego 7f6d9b2b91 Adjust printf length modifier, fixes the warning:
qtx/list.c:54: warning: format '%d' expects type 'int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26561 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 12:01:13 +00:00
diego f2d8773fca Comment out variables only used in commented-out code, fixes the warnings:
qtx/qtxload.c:46: warning: unused variable 'i'
qtx/qtxload.c:45: warning: unused variable 'esp'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26560 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:57:38 +00:00
diego 5540775eb8 Link against individual objects, the osdep library is not generated anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26559 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:55:21 +00:00
diego a001647301 Remove obsolete and non-working test program.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26558 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:52:56 +00:00
diego df22d5fd5d Make OBJS depend on the recurse target instead of just the all target.
This fixes 'make mplayer' and 'make mencoder'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 11:22:25 +00:00
diego caca521296 Remove .S files from list of files to generate dependencies for.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 10:44:59 +00:00
Uoti Urpala f800a42e45 osdep: Remove cruft
Delete some commented out or otherwise unused lines.
2008-04-28 12:18:48 +03:00
Uoti Urpala eaf7857b7f timers: Remove GetRelativeTime()
Move the code calculating time delta since last query out of the
platform-specific drivers and into mplayer.c. The platform-specific
drivers now return absolute values only.

The way the code in timer-darwin.c uses doubles in wrapping arithmetic
looks questionable and this change might make problems in it more
visible.
2008-04-28 12:18:45 +03:00
Uoti Urpala c693b77e93 osdep: Change timer_name to a saner type
timer_name was a (non-const) pointer to a const char array. Make the
symbol the array itself.
2008-04-28 12:16:13 +03:00
Uoti Urpala e5fab9566d m_option.h: #include <stddef.h> for offsetof 2008-04-28 12:16:13 +03:00
Uoti Urpala 634af01685 loader/qtx/qtxsdk/components.h: Disable large unused inline functions
Put various dump_* functions under #if 0. They aren't used by any
current code but trigger compiler warnings.
2008-04-28 12:16:13 +03:00
Uoti Urpala fbdb41c321 demux_mkv.c: Compiler warning fixes
* libmpdemux/demux_mkv.c:218: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type
* libmpdemux/demux_mkv.c:1235: warning: passing argument 1 of ‘grow_array’ from incompatible pointer type

Change grow_array to return the reallocated pointer instead of setting
it through a void **.

* libmpdemux/demux_mkv.c:1396: warning: unused variable ‘mkv_d’

Remove.

* libmpdemux/demux_mkv.c:1740: warning: pointer of type ‘void *’ used in  arithmetic

Change struct mkv_track->private_data from void * to unsigned char *.

* libmpdemux/demux_mkv.c:2693: warning: assignment from incompatible pointer type

Add a cast.

* libmpdemux/demux_mkv.c:2239: warning: ‘demux_mkv_reverse_id’ defined but not used

Remove the function (together with preceding useless advance
declaration of demux_mkv_seek).
2008-04-28 12:16:13 +03:00
Uoti Urpala 5c2583a0ee Make MPlayer build with a complete FFmpeg checkout in ffmpeg/
Instead of separate checkouts of the FFmpeg libavutil/, libavcodec/,
libavformat/, libpostproc/ subdirectories make MPlayer build with a
complete checkout of FFmpeg under ffmpeg/.

configure now creates config.mak and config.h at both the top level
and in ffmpeg/. The config.h files are identical. The config.mak for
FFmpeg has different include paths. The top-level common.mak and
subdir.mak are now used by libswscale only; the directories under
ffmpeg/ use the versions in ffmpeg/.
2008-04-28 12:16:12 +03:00
Uoti Urpala 2faffe2a7f Merge svn changes up to r26555 2008-04-28 12:15:18 +03:00
diego ae09115f2b Merge mp3lib/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-27 22:53:18 +00:00