RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
28,293 Commits 41 Branches 86 Tags 141 MiB
Commit Graph

649 Commits

Author SHA1 Message Date
Uoti Urpala 66cefd5f71 ao_alsa: If pause loses samples replace them with silence 
If the ALSA pause functionality is not available the driver has to
drop buffered samples when MPlayer calls pause(). Replace them by
playing a corresponding amount of silence in resume() instead of
shortening the overall audio duration.
 2008-12-08 22:36:06 +02: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 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
cehoyos 22bb046adc Replace numeric constants by their defines. 
Fixes icc warning #188: enumerated type mixed with another type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27738 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-09 17:08:47 +00:00
ranma cb8c70d6c2 Fix "format '%d' expects type 'int', but argument 6 has type 'size_t'" warning. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27714 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-04 15:11:39 +00:00
ranma 68fa9667ec Make alsa resume after suspend to disk (would say 'file descriptor is in bad state' before this change) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27712 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-04 15:03:10 +00:00
Uoti Urpala 259ea9d703 Merge svn changes up to r27573 
Conflicts:
	libmpcodecs/vd_ffmpeg.c
 2008-09-10 23:59:08 +03:00
diego 3311a2ae9c Replace casual GPL notices by proper license headers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-07 14:09:51 +00:00
diego 691a41a817 Replace casual GPL notice by proper license header. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27534 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-06 18:19:37 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
ranma 4445a58fd3 Fix 'cast from pointer to integer of different size' on 64bit architectures. Casting to long should work for 32bit and 64bit and not make a difference to the boolean operation (since 'format' is always 32bit (int) the upper 32bit of 'arg' won't matter, but the compiler should be happy now. Casting both to unsigned makes sure the compiler isn't messing things up by sign-extending 'format' to 64bit before masking) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27482 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-24 13:52:54 +00:00
ranma 7f26ceaa54 Handle AOPLAY_FINAL_CHUNK 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27481 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-24 13:36:04 +00:00
ranma d5df440c7f fix compiler warnings 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27478 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-23 08:14:37 +00:00
diego 5a4496ca5d Work correctly with very small files where less than outburst is to be played. 
patch by Tobias Diedrich, ranma tdiedrich de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27467 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-15 17:14:53 +00:00
diego 511729a3a2 Use '#include <poll.h>' instead of '#include <sys/poll.h>'. 
It is the standard location as defined by the Open Group.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27463 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-14 15:54:53 +00:00
diego 20e0b5c831 100l: Rename missed preprocessor directives from a HAVE_ prefix to CONFIG_. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27462 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-14 15:48:11 +00:00
Uoti Urpala 9f7c6291a5 Remove special error message for -ao alsa1x and alsa9 
Those variants were removed in 2004. Remove the special handling of
those ao names and treat them like any other unrecognized ao name.
This removes a questionable exit_player() call.
 2008-08-12 14:57:18 +03:00
Uoti Urpala 8d5912e60d mpeg ao/vo drivers: Fix packet-writing helper function types 
Add missing 'const' to callback functions passed to
send_mpeg_pes_packet() / send_mpeg_lpcm_packet().
 2008-08-12 14:57:17 +03:00
Uoti Urpala 680703ecae ao_mpegpes: Remove declarations of unused functions 2008-08-12 14:57:17 +03:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +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 024b6efdf1 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x. 
Use it in all the places that checked for either ALSA 0.9 or 1.x.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-06 23:19:29 +00:00
diego 473e2824cb Rename all preprocessor directives related to Apple / Mac OS X. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-06 07:42:26 +00:00
diego f83e779ee4 Rename some audio-output-related preprocessor directives. 
Switch them from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-05 16:32:47 +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
diego 52d358e3dc Set HAVE_DVB in configure when HAVE_DVB_HEAD is defined 
instead of doing in redundantly in DVB-specific files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27401 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 21:39:29 +00:00
diego 429bf7a9dc cosmetics: typo fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27400 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 20:35:29 +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 2d4656e070 Merge svn changes up to r27332 2008-07-21 15:03:49 +03:00
reimar 6dfb85dc9e Our ALSA code needs alloca, so check for it in configure and include alloca.h 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-17 17:11:30 +00:00
Uoti Urpala de560e8167 Merge svn changes up to r27123 
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
 2008-06-23 03:58:44 +03:00
corey 5eee4632d3 Add verbose messages about trying and searching for audio output drivers. 
Add messages showing why a specified audio output driver failed to be used.

Based on a patch from Bryan Henderson, giraffedata [[]] gmail :: com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27123 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-22 19:25:54 +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
diego 92f79295d2 Use standard license header, merge changelog into license header and TODO. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-06 00:45:35 +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 bc0058c63e cosmetics: Remove pointless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:31:55 +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
diego b10c35e0ed Use standard license headers with standard formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-14 18:02:27 +00:00
reimar c8b5921d06 Avoid dependency on newer pulseaudio version. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26681 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-07 22:46:50 +00:00
Uoti Urpala 267a3f4c9c Merge svn changes up to r26680 
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
 2008-05-07 13:15:37 +03:00
reimar 1758d95819 Remove a comment that makes no longer sense (since quite some time actually) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26637 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:59:37 +00:00
reimar 0f5ee4b7bd Support 32 bit float and integer formats in ao_pcm.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:58:52 +00:00
reimar 71247a97b3 Add support for 32 bit format to ao_pulse. 
Based on patch by James Warden [warjamy yahoo com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26635 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:51:25 +00:00
reimar e1e2527cd4 Make ao_pulse fall back to s16le format instead of just failing. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26634 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-01 16:47:54 +00:00
Uoti Urpala 0e757bf9da Remove _s/_st suffix from some struct names 
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
 2008-04-25 03:34:22 +03:00
diego 2bcda50ffe Merge libao2/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26507 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-23 09:33:51 +00:00
reimar 9623100d13 reset() should not senselessly close and reopen 
the device but instead just call flush_audio()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26345 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-07 17:39:41 +00:00