summaryrefslogtreecommitdiffstats
<
Commit message (Collapse)AuthorAgeFilesLines
* input: Remove separate mp_input_add_event_fdUoti Urpala2008-04-2910-63/+29
| | | | | | | | 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.
* input.c: Revert code uglifications done for gcc 2.95Uoti Urpala2008-04-291-9/+5
| | | | | | 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.
* input.c: Remove unnecessary #include "osdep/getch2.h"Uoti Urpala2008-04-291-1/+0
|
* Makefile: Fix RECURSIVE_RULE with nested subdirectoriesUoti Urpala2008-04-291-1/+1
| | | | | | | 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".
* Merge svn changes up to r26587Uoti Urpala2008-04-2923-207/+88
|\ | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Get rid of now obsolete library rules and variables.diego2008-04-282-17/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26587 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Reorder commands in (dist)clean targets.diego2008-04-281-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26586 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove '-' prefix from 'rm -f' commands for consistency.diego2008-04-281-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26585 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark phony checkheaders target as such.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26584 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge now redundant clean and distclean rules into the top-level Makefile.diego2008-04-282-9/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Force to uint64_t first to avoid direct conversion from double to unsigned int.ulion2008-04-281-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26582 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove code for .depend generation, inclusion and related hacks.diego2008-04-282-13/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26581 b3059339-0415-0410-9bf9-f77b7e298cf2
| * .depend should no longer be ignored.diego2008-04-280-0/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26580 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Run 'make depend', not 'make .depend' in FFmpeg subdirectories.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26579 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary CFLAGS hack.diego2008-04-281-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26578 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary -I.. from CFLAGS, change -I../libavutil to -Ilibavutil.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26577 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use consistent #include paths without "../".diego2008-04-289-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use full path for libavutil #includes.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26575 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Consistently #include mpbswap.h instead of bswap.h everywhere.diego2008-04-284-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26574 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge loader/Makefile into top-level Makefile.diego2008-04-282-54/+41
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Restore line mistakenly commented out in the last commit.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26572 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure all autogenerated .h and .c files exist in the vidix subdirectorydiego2008-04-281-2/+5
| | | | | | | | | | | | | | before trying to create object or dependency files there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26571 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwardsdiego2008-04-282-4/+2
| | | | | | | | | | | | | | 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
| * Add missing ldt_keeper.h #include; this fixes a bunch of implicit declarationdiego2008-04-282-0/+2
| | | | | | | | | | | | | | of function warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26569 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge TEST_OBJS and TEST_LDFLAGS.diego2008-04-281-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26568 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -g to CFLAGS, not to LDFLAGS.diego2008-04-281-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26567 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge test program compilation rules using patterns.diego2008-04-281-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26566 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add CFLAGS to test program compilation commands.diego2008-04-281-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26565 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing ../osdep/mmap_anon.o to TEST_OBJS.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26564 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary linker flags.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26563 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing #include, fixes the warning:diego2008-04-281-0/+1
| | | | | | | | | | | | | | 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
| * Adjust printf length modifier, fixes the warning:diego2008-04-281-1/+1
| | | | | | | | | | | | | | 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
| * Comment out variables only used in commented-out code, fixes the warnings:diego2008-04-281-2/+2
| | | | | | | | | | | | | | | | 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
| * Link against individual objects, the osdep library is not generated anymore.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26559 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove obsolete and non-working test program.diego2008-04-283-74/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26558 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make OBJS depend on the recurse target instead of just the all target.diego2008-04-281-1/+3
| | | | | | | | | | | | | | This fixes 'make mplayer' and 'make mencoder'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26557 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove .S files from list of files to generate dependencies for.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26556 b3059339-0415-0410-9bf9-f77b7e298cf2
* | font_load_ft.c: Make tables constUoti Urpala2008-04-281-2/+2
| |
* | osdep: Remove cruftUoti Urpala2008-04-282-21/+0
| | | | | | | | Delete some commented out or otherwise unused lines.
* | timers: Remove GetRelativeTime()Uoti Urpala2008-04-286-51/+24
| | | | | | | | | | | | | | | | | | | | 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.
* | osdep: Change timer_name to a saner typeUoti Urpala2008-04-284-4/+4
| | | | | | | | | | timer_name was a (non-const) pointer to a const char array. Make the symbol the array itself.
* | m_option.h: #include <stddef.h> for offsetofUoti Urpala2008-04-281-0/+1
| |
* | loader/qtx/qtxsdk/components.h: Disable large unused inline functionsUoti Urpala2008-04-281-0/+2
| | | | | | | | | | Put various dump_* functions under #if 0. They aren't used by any current code but trigger compiler warnings.
* | demux_mkv.c: Compiler warning fixesUoti Urpala2008-04-281-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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).
* | Make MPlayer build with a complete FFmpeg checkout in ffmpeg/Uoti Urpala2008-04-285-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | 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/.
* | Merge svn changes up to r26555Uoti Urpala2008-04-2812-136/+109
|\|
| * Merge mp3lib/Makefile into top-level Makefile.diego2008-04-273-22/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26555 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge liba52/Makefile into top-level Makefile.diego2008-04-272-19/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26554 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary compilation command that shadows GNU Make builtin command.diego2008-04-271-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26553 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary -lm linker flag from test program compilation command.diego2008-04-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26552 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge libmpeg2/Makefile into top-level Makefile.diego2008-04-262-23/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26551 b3059339-0415-0410-9bf9-f77b7e298cf2
| * clean and distclean rules do the same thing.diego2008-04-261-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26550 b3059339-0415-0410-9bf9-f77b7e298cf2
| * clean and distclean rules do the same thing.diego2008-04-261-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26549 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/Makefile into top-level Makefile.diego2008-04-263-58/+37
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge clean and distclean rules.diego2008-04-261-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26547 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark alltools target as phony.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26546 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile libmpcodecs/ve_qtvideo.c on Windows.diego2008-04-263-2/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add alltools target and variable to build non-linking tools.diego2008-04-261-2/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26544 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add vidix to parts when VIDIX is enabled.diego2008-04-261-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26543 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Take Objective C files into account when generating dependencies.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26542 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add rule for generating dependency files from Objective C files.diego2008-04-261-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26541 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Add .gitignore filesUoti Urpala2008-04-272-0/+21
| |
* | vd.c: Make extern decoder declarations constUoti Urpala2008-04-261-23/+23
| | | | | | | | | | | | The earlier commit "Make video decoder description structs const" made the definitions const but didn't change the extern declarations in vd.c to match. Fix those to be const too.
* | Make audio decoder description structs constUoti Urpala2008-04-2629-56/+56
| | | | | | | | | | | | Make the per-decoder struct ad_functions and its ->info struct constants. Same for the mpcodecs_ad_drivers[] table of pointers to those structs.
* | vf_divtc.c: Make pointlessly static variable a normal localUoti Urpala2008-04-261-1/+1
| | | | | | | | | | | | Apparently because it was declared together with local constant tables (for which the "static" part was useless but harmless) a pointer variable was also declared static.