RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity
31,000 Commits 43 Branches 87 Tags 170 MiB
173beb5608
Commit Graph

190 Commits

Author SHA1 Message Date
Uoti Urpala
4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
reimar
1a5841fbbb Add a proper header for our strsep implementation so strsep will 
not be used without a declaration, causing issues on 64 bit systems.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-17 15:08:31 +00:00
Uoti Urpala
819b8f08a2 Merge svn changes up to r30236 2010-01-08 02:44:37 +02:00
zuxy
0d3adaac4b Happy new year! 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30235 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-07 11:12:58 +00:00
Uoti Urpala
a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
Uoti Urpala
0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar
e306174952 Translation system changes part 2: replace macros by strings 
Replace all MSGTR_ macros in the source by the corresponding English
string.
 2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14 Translation system changes part 1: wrap translated strings 
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
 2009-07-07 01:28:07 +03:00
reimar
71fefd86ac Use a malloced string for the get_term_charset return value. 
This is necessary at least on POSIX systems since the buffer returned by
nl_langinfo may change its contents with e.g. each setlocale call.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29332 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-31 13:00:51 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-13 02:58:57 +00:00
Uoti Urpala
1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego
d9ded9284c Add missing 'void' to parameterless function declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-04 17:35:26 +00:00
diego
fc4f741709 cosmetics: reindent 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29198 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-19 22:27:02 +00:00
Uoti Urpala
53eeb0e412 Merge branch 'ordered_chapters' 2009-04-08 02:43:44 +03:00
Uoti Urpala
58497380e5 Initial ordered chapters support 
Add basic support for Matroska ordered chapters. The switching between
segments is implemented as a general edit timeline that could also be
used for other purposes.

Some things still need improvement. In particular the current code
does not try to do any proper mapping between audio/video/subtitle
streams of different files and there should be options for better
control of how MPlayer searches other files for the required content.
 2009-04-02 06:51:25 +03:00
Uoti Urpala
cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
diego
a21feef029 cosmetics: Remove file names from file header, it only causes trouble. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28959 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 12:45:16 +00:00
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
diego
fffc93fd94 Add back mistakenly removed copyright notice. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28802 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-03 16:17:11 +00:00
diego
86a2eadf4c Add standard license headers to files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28779 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 13:13:25 +00:00
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego
f46a19a93f Remove unnecessary _UWIN #define. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28529 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-11 00:38:42 +00:00
diego
cdfafa6999 Add priority support for OS/2 and factorize the Windows priority support. 
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-10 15:34:44 +00:00
Uoti Urpala
79e1aa7cc7 Merge svn changes up to r28341 
Conflicts:
	configure
	libmpcodecs/native/rtjpegn.c
 2009-01-19 00:04:43 +02:00
diego
7db7002523 Update copyright year, patch by Zhou Zongyi, zhouzongyi pset.suntec net. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28312 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-15 08:46:17 +00:00
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310 
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
 2009-01-15 05:57:31 +02:00
uau
453198ae1b timer-win2.c: Fix "voi" (void) typo breaking Windows compilation 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28269 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-05 18:05:34 +00:00
diego
824abb5a65 Add missing 'void' keyword to parameterless function declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-05 14:48:03 +00:00
Uoti Urpala
8c144171bb Merge svn changes up to r28087 
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
 2008-12-04 01:55:52 +02:00
diego
0864f92e7a Get rid of pointless 'extern' keywords. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 23:01:03 +00:00
Uoti Urpala
e107cf7851 Use correct terminal "clear line" code 
The "erase_to_end_of_line" string used to clear the terminal status
line was initialized with the termcap id "cd", which means to clear
all lines below the cursor. Change it to the correct "ce" to clear the
current line.

Usually the status line is on the bottommost line of the terminal so
the behaviour wouldn't differ much. However it did make a difference
when I tested starting MPlayer at the top of a huge gnome-terminal
window so the status line was not at the bottom; in that case clearing
just the current line used less CPU than clearing the part of the huge
window below the status line.
 2008-08-13 06:06:29 +03:00
Uoti Urpala
cab2e4f5ca Include corresponding .h in some .c files 2008-08-12 13:46:01 +03:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441 
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
 2008-08-08 02:13:09 +03:00
diego
091d352d06 Rename font-related preprocessor directives. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 10:36:07 +00:00
Uoti Urpala
6cce822505 Merge svn changes up to r27399 
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
 2008-08-02 22:04:35 +03:00
diego
d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate; 
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-01 20:28:58 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374 
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
 2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives. 
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 12:01:30 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979 
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
 2008-06-04 08:10:48 +03:00
diego
5423c418c2 cosmetics: Remove useless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:42:28 +00:00
ulion
5011271192 Remove useless variable startup_time, since we do not need it any more. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26672 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-05 00:35:30 +00:00
Uoti Urpala
bec3b84f5e Merge svn changes up to r26624 
Conflicts:

	Makefile
 2008-05-01 08:18:50 +03:00
diego
405385d0ba Use consistent include paths, we always build from the top level now. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26603 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-30 11:06:07 +00: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
06a35804f3 Merge svn changes up to r26587 
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
 2008-04-29 05:03:57 +03: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
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