github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-09-09 01:16:56 +02:00
Code Releases Activity
28,243 Commits 41 Branches 85 Tags 163 MiB
52ee93c1c6
Commit Graph

1315 Commits

Author SHA1 Message Date
Uoti Urpala
835511ac39 Merge svn changes up to r28038 2008-11-25 21:12:01 +02:00
reimar
c8993e3c66 Reimplement -endchapter support again for -dump*, it was broken in r25987. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27987 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-23 12:45:07 +00:00
Uoti Urpala
e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
diego
74dd64e71d Add an option that sets initial playback volume. 
patch by Reimar and rvm, rvm3000 ya com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27872 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-31 18:44:45 +00:00
Uoti Urpala
479f5e742f Merge svn changes up to r27841 
Conflicts:
	mplayer.c
 2008-10-28 04:12:18 +02:00
aurel
97293969b4 Factorize vobsub idx/extradata handling. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-27 22:51:22 +00:00
aurel
65db2ef944 Avoid calling init_vo_spudec() too early. 
(before mpctx->d_sub->sh initialization)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27839 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-27 22:34:33 +00:00
Uoti Urpala
0301309425 Merge svn changes up to 27824 
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
 2008-10-25 05:12:34 +03:00
diego
4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__. 
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 16:23:55 +00:00
Uoti Urpala
ebb4abf208 Merge svn changes up to r27682 
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c
 2008-10-02 05:17:23 +03:00
nicodvb
20e4a74eb5 slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27667 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-26 21:17:01 +00:00
reimar
e628297bbd Since the pause loop now also runs commands, set mpctx->was_paused 
before entering it for more consistency.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27666 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-25 17:42:56 +00:00
reimar
97cf6acdab Add an experimental pausing_keep_force slave mode command prefix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27665 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-25 17:40:33 +00:00
Uoti Urpala
8ea7eb77fc core: Clean up move-to-next-file logic 
The mpctx->eof field was used to also store other reasons to stop
playing the current file besides EOF, and the code didn't properly
distinguish those from EOF. Rename the field to "stop_play" and clean
up some of the code accessing it. Properly separating EOF from other
reasons allows handling file switching better.

Before this commit buffered audio was always drained before moving to
the next file (the only exception when it was NOT drained when
stopping a file was when quitting the player completely). This added
an extra delay when manually moving to the next file as you had to
wait for the currently buffered audio to finish playing before the
next file would start. After this commit audio is only drained if the
file reaches EOF normally; otherwise audio is cut and the next file
starts immediately.
 2008-08-13 08:06:26 +03:00
Uoti Urpala
e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
Uoti Urpala
9425571f41 mplayer.c: #include mplayer.h and access_mpcontext.h 
Both declare symbols defined in mplayer.c, so include them to make the
compiler check the declarations match.
 2008-08-12 14:57:18 +03:00
Uoti Urpala
cfe2839386 Move some declarations from mplayer.c to proper headers 
Declare mp_input_register_options in input.h and
xscreensaver_heartbeat in x11_common.h.
 2008-08-12 14:57:18 +03:00
Uoti Urpala
f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
diego
ff2a3dd060 Use translatable string instead of hardcoded message for process priority. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27445 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-09 15:45:00 +00: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
e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and 
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 12:20:50 +00: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
diego
141e81cce4 Rename a bunch of miscellaneous preprocessor directives. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 08:58:07 +00:00
diego
82f319af62 Change a bunch of X11-specific preprocessor directives. 
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-04 06:16:23 +00:00
diego
02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from 
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 15:21:40 +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
diego
6138ec05eb Rename preprocessor directive HAVE_MENU --> CONFIG_MENU. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27377 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 18:07:19 +00:00
diego
3b31fa5717 Rename two GUI-related preprocessor directives: 
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 13:44:59 +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
reimar
f6b9076a6d Use GetTimerMS() instead of time() with srand. 
This is more portable and avoids generating the same random numbers
for a whole second (and on MinGW for some unexplainable reason for
almost 10 seconds).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27353 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-26 21:58:00 +00:00
Uoti Urpala
06c533b167 Fix crash during early exit 
Starting MPlayer with options such as "-demuxer help" that exit before
initializing OSD struct would crash at exit because of a reference to
mpctx->osd->sub_font in deinitialization code. Fix by checking that
mpctx->osd is not NULL.

Checking that osd->sub_font is not NULL was unnecessary because
free_font_desc(NULL) is safe.
 2008-07-09 20:02:34 +03:00
Uoti Urpala
0f73474fca Fix compilation with dvdnav enabled 
Some dvdnav-specific code had not been properly updated after moving
options to option struct and removing global mpctx.
 2008-06-26 06:42:03 +03:00
Uoti Urpala
0e85dc0f32 Move global sub_font to OSD struct 2008-06-24 08:29:36 +03:00
Uoti Urpala
dd89386500 Remove unnecessary casts of sh_video->vfilter 
The casts were left from the time when the type of sh_video->vfilter
was (unnecessarily) void *. Now that the field has the correct type
the casts are pointless.
 2008-06-24 02:03:19 +03:00
Uoti Urpala
a232f564d3 Create a context struct for OSD state 
This commit creates the struct and passes it to some functions that
needs to access OSD state but does not yet move much data from globals
to it.

vf_expand accesses the OSD state for rendering purposes outside of the
normal OSD draw time. The way this currently works is suboptimal, but
I did not attempt to clean it up now. To keep things working the same
way vf_expand needs to know the address of the state object to be able
to access the data even in the functions that should normally not need
it. For that purpose this commit adds a VFCTRL to tell vf_expand the
address of the object.
 2008-06-24 01:53:58 +03:00
Uoti Urpala
68e70b3ec3 Merge svn changes up to r27092 
Conflicts:

	libmpdemux/demuxer.c
	libvo/vo_xv.c
	mencoder.c
 2008-06-17 05:04:32 +03:00
reimar
dcd0902bcd Try harder to honour CTRL+C etc. during dumpstream 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27092 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-16 18:42:58 +00:00
diego
ca8d41adb5 Add the ugly HELP_MP_DEFINE_STATIC back, otherwise we produce warnings like 
./help_mp.h:21: warning: 'help_text' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27071 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-15 13:37:44 +00:00
diego
da3eec542c Remove pointless HELP_MP_DEFINE_STATIC definition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27068 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-15 12:56:09 +00:00
Uoti Urpala
af3fcdf2de Merge svn changes up to r27025 
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
 2008-06-07 19:57:57 +03:00
ben
c71d348a7d Rename some functions as they are mplayer related and not 
from libdvdnav public API.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27018 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-07 12:57:23 +00:00
diego
f9810c0dfb Fix the linking of TOOLS/netstream and TOOLS/vivodump. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-06 13:28:25 +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
ben
bc212e3500 Add a slave command to stop stream playback. 
Mostly useful when used with -idle mode.
Patch by Mathieu Schroeter ( mathieu dot schroeter at gamesover dot ch )



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26909 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 18:39:57 +00:00
reimar
05f93a0054 Re-add (hackish) support for -chapter (only start chapter, end is not supported) with -dumpstream. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26864 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-24 07:47:11 +00:00
reimar
08678c2c6a Avoid crash with video stream switching and -nosound 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26850 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-21 20:46:05 +00:00
Uoti Urpala
a41db36b22 Merge svn changes up to r26783 
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
 2008-05-15 21:19:35 +03:00
ben
c289ff3a72 Delcare a dvdnav-specific input section if the currently played 
stream is from such a type.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26760 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-13 17:26:41 +00:00