mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code
26,689 Commits 40 Branches 85 Tags 155 MiB
431bf1f5b6
Commit Graph

26689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uoti Urpala
431bf1f5b6 Merge svn changes up to r26599 2008-04-30 06:09:04 +03:00
diego
2e30b5c260 Move CFLAGS setting to configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26599 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 22:27:50 +00:00
compn
f6aa0e996a change cvs > svn 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26598 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 17:54:54 +00:00
compn
3b374ac091 add info lines to ffmimic, ffkmvc. fixes codec-status table. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26597 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 17:45:41 +00:00
Uoti Urpala
4237cb821b Move allocation/free of x11 struct to x11_common.c 
Allocate the struct in the init function and free in uninit.
 2008-04-29 16:22:33 +03:00
Uoti Urpala
d3113662b0 Mark option -key-fifo-size global 
The fifo is only allocated once and not resized later. After the
previous commit trying to change it for later files would have no
effect. With older code it could cause memory corruption if you set
the option to a value larger than the already allocated size.
 2008-04-29 15:52:32 +03:00
Uoti Urpala
06405a5ba5 Move key_fifo_size & doubleclick_time to options struct 2008-04-29 15:52:29 +03:00
Uoti Urpala
77ec83e351 Add a context for mp_fifo 
Store data in an allocated context and take it as an argument instead
of using static variables.
 2008-04-29 15:36:51 +03:00
Uoti Urpala
f59cda84b1 mp_fifo.c, osdep/: Include corresponding .h in .c files 2008-04-29 14:52:45 +03:00
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
diego
092b951e23 Link tools against mp_msg-mencoder.o instead of mp_msg.o. 
The latter may depend on the GUI and cause link failures.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26596 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 09:19:03 +00:00
Uoti Urpala
5a08b7f96d input.c: Remove unnecessary #include "osdep/getch2.h" 2008-04-29 12:13:20 +03:00
diego
39723967ed Merge mpcommon.mak into Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26595 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 08:53:08 +00:00
diego
b4c9a8858f cosmetics: Move version.h/help_mp.h generation rules to a better place. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26594 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 08:35:58 +00:00
diego
d663d7facb 10l: Add missing \ for line continuation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26593 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 08:05:44 +00:00
diego
281fe4b483 Do not rebuild version.h at every Makefile change. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26592 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 08:04:59 +00:00
diego
838d308e41 Convert clean/distclean into non-recursive targets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26591 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 07:37:35 +00:00
diego
e1d2feecca Remove generated headers and generated helper binaries only on distclean. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26590 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 07:10:55 +00:00
diego
532b9ab814 Remove unnecessary dependency declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26589 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 07:00:27 +00:00
diego
db1be5d74e Merge nearly identical SRCS_COMMON lines. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26588 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-29 06:59:11 +00: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