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

790 Commits

Author SHA1 Message Date
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 e62517ef6a Merge svn changes up to r28065 2008-12-02 18:02:05 +02:00
reimar bd7e915bf5 Move PTHREAD_CACHE define logic to configure. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28048 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-28 17:04:36 +00:00
Uoti Urpala 1715c2a336 Merge svn changes up to r27949 
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
 2008-11-17 20:50:23 +02:00
reimar 7ecf9a6d04 100l, stream->cache_pid can not be used directly in pthread_create, 
it has the wrong type. Luckily we currently do not need the value anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27930 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 19:43:39 +00:00
reimar ca77ee41f0 Use pthreads for the cache on Cygwin, since _beginthread is not available 
and the previous CreateThread method would probably leak memory here, too.
Also pthreads seems to be the official Cygwin threading API.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27928 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-15 19:08:50 +00:00
reimar 1f52c9ed8b Include cache2.h in cache2.c, fixes an implicit declaration warning for cache_do_control 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27910 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-14 19:29:04 +00:00
Uoti Urpala e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
nicodvb e3d5eacec3 set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27897 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-05 23:37:52 +00:00
reimar 1efaaef8a6 Intialize unused fd variables to -1 (which is actually invalid) instead 
of 0 (which is stdin and can cause weird side-effects).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27893 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-04 18:44:14 +00:00
reimar 2808f340cd Fix condition broken in r27401 which incorrectly caused stdin to be closed after playing DVB. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27892 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-04 18:42:46 +00:00
reimar a2cd1d4d04 Forgotten reindent 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27882 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-02 17:15:44 +00:00
reimar 863a334a9f Add a noicyx:// protocol to allow easier testing for misconfigured servers. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27881 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-02 17:15:14 +00:00
reimar 6818a5e843 vfw.h needs a windows.h include before on MinGW64. 
Since vfw.h on MinGW32 includes windows.h automatically it should not make a difference there.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27880 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-02 16:46:02 +00:00
reimar d4020af479 Avoid a memleak if allocation of field_name fails, fixes bug #1319. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27868 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-31 12:56:25 +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 c0f231ac47 Conditionally declare a conditionally used variable, fixes the warning: 
stream/dvb_tune.c:99: warning: unused variable 'sec_dev'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27820 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-24 09:13:04 +00:00
diego ed0af8844a Determine default CD/DVD device in configure instead of using an #ifdef jungle. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27809 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-21 07:02:25 +00:00
diego 6f6bf7f765 Replace typeof by __typeof__, the former is a non-portable GNU extension. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27807 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-20 09:55:38 +00:00
reimar 3d1f36e3e7 Avoid CreateThread and especially TerminateThread since they cause a memleak. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27804 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-19 18:05:45 +00:00
reimar 834d4c5b7b Remove useless casts. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27803 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-19 17:28:23 +00:00
diego 2195547220 Revert declaring ThreadProc as void, it breaks the WINAPI. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27790 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-16 19:24:21 +00:00
diego 629db77d89 Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs. 
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-16 18:28:38 +00:00
diego 17f509905c Rename stream/netstream.h to stream/stream_netstream.h; netstream.h to make it 
clearer that netstream.h belongs to stream_netstream.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27779 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-16 17:01:40 +00: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
diego 9214b77133 Declare ThreadProc as void, it does not return anything, fixes the warning: 
stream/cache2.c:364: warning: control reaches end of non-void function


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27759 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 15:51:29 +00:00
diego bc7cf2efd8 Remove unused function, fixes the warning: 
stream/tvi_dshow.c:1311: warning: 'reconnect_pins' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27758 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 15:25:34 +00:00
diego c8808af5a0 Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin: 
stream/cache2.c:244: warning: implicit declaration of function `shmem_alloc'
stream/cache2.c:265: warning: implicit declaration of function `shmem_free'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27757 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 15:13:40 +00:00
diego ac3b6d090c Move socklen_t typedef from config.h to stream/network.h. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27744 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-12 12:12:41 +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
voroshil 8095d9dacf Add debug message about loaded frequency tables. 
Replace printed code of input type with user-frendly "broadcast"/"cable" strings.

patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27662 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-24 20:49:27 +00:00
voroshil 7132e7d852 Make output messages of frequency selection code more useful by 
providing additional information like requested frequency
and found nearest fequency/channel.

patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27661 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-24 20:42:15 +00:00
voroshil 89600cd4ca Fix overflow in frequency conversion code inside tvi_dshow. 
patch from Laurent laurent dot aml at gmail dot com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27660 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-24 20:30:06 +00:00
Uoti Urpala 849dc0ba31 Merge svn changes up to r27649 
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
 2008-09-20 16:13:33 +03:00
diego 261e389fdd With -identify, ID_DVD_VOLUME_ID is not shown on some systems. 
Using DVDISOVolumeInfo instead of DVDUDFVolumeInfo fixes this.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27631 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-16 21:30:04 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
diego 788a4d5f91 Move '#define closesocket close' preprocessor directive to a common place 
and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27505 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-01 07:31:57 +00:00
diego f27f04a53d Revert moving closesocket definition and network headers to network.h. 
This caused lots of trouble on MinGW, we need a different solution.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-31 13:59:54 +00:00
rathann 97e5f304ce Rename internal libdvdread fork from dvdread to libdvdread 
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-30 12:22:21 +00:00
reimar fd75ca0c6a Print DVD volume ID with -identify. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-30 11:21:11 +00:00
diego c152b07e66 Move duplicated '#define closesocket close' into network.h along with 
network-related #include #ifdeffery.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-29 22:55:39 +00:00
diego 2a90e559a9 consistency cosmetics: Avoid using .. in #include paths. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-29 22:29:27 +00:00
diego 3af860b877 Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H. 
This is what it is called in FFmpeg and more consistent with other
names for similar conditionals. This fixes a potential compilation
failure on MinGW, as described in Bugzilla #1262.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-29 20:05:08 +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
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala cab2e4f5ca Include corresponding .h in some .c files 2008-08-12 13:46:01 +03:00
Uoti Urpala 0d09176078 stream.h: Add 2 prototypes instead of declaring them in cache2.c 
Declare stream_fill_buffer() and stream_seek_long() always (before
they were only declared if cache was disabled and those were used
instead of cached versions). Remove the now redundant declarations in
cache2.c.
 2008-08-12 12:49:37 +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 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