Uoti Urpala
ae2faad666
Merge svn changes up to r28951
2009-03-14 23:52:45 +02:00
ben
540847db7b
Ensure the string we're trying to compare is actually not NULL.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28920 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:31:03 +00:00
ben
571c0fb8a9
The first valid index is total count - 1 (usually 0)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28919 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:30:24 +00:00
Uoti Urpala
0c6f667896
Merge svn changes up to r28755
2009-02-28 05:58:59 +02:00
reimar
8605d7090e
Use memset to make sure all parts of struct sockaddr_in are always initialized.
...
Problem reported by [kmkaplan+mplayer-dev-eng (at) kim kim-minh com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28732 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-25 12:51:20 +00:00
Uoti Urpala
66f6f9f076
Merge svn changes up to r28712
2009-02-23 21:00:52 +02:00
diego
ee50536b74
Accept DVB API 5, patch by Steven Brudenell, steven.brudenell gmail com.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28702 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-22 14:12:33 +00:00
Uoti Urpala
186e5a998c
Merge svn changes up to r28641
...
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego
1b915e419e
Replace double semicolon by single semicolon.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
Uoti Urpala
9790f4e6e7
Merge svn changes up to r28461
2009-02-04 00:28:17 +02:00
diego
7e1662839a
Restructure network tests: Always check for both inet_aton and inet_pton.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28439 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 14:38:28 +00:00
diego
0f65d3be9d
Convert HAVE_WINSOCK2_H into a 0/1 definition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:42:27 +00:00
diego
3b222d68b0
HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:33:35 +00:00
diego
be5f5c7046
Convert HAVE_CLOSESOCKET and HAVE_SOCKLEN_T into 0/1 definitions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28434 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:16:46 +00:00
Uoti Urpala
dd888b05ff
Merge svn changes up to r28366
...
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
2009-01-26 00:58:15 +02:00
reimar
84fbeecf72
Fix a NULL-check that used && instead of || and thus could not avoid crashes.
...
Patch by Luis Felipe Strano Moraes (luis strano gmail com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28354 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 18:23:05 +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
reimar
4af9bf7e02
Switch internal dvdread to libdvdread SVN external.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-08 19:28:28 +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
reimar
82d097d04b
Fix DVD seek_to_chapter: the title number must be converted to a per-VTS
...
title number first. Also add a few out-of-bounds checks just in case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28226 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:46:34 +00:00
reimar
a2c2268cdf
Work around a dvdread bug where DVDReadBlocks would return values < 0 on read error,
...
causing hangs e.g. when seeking to the very last chapter (which would read beyond the
size of the DVD).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-31 14:21:50 +00:00
Uoti Urpala
c1b80dcbbb
Merge svn changes up to r28204
2008-12-27 17:40:57 +02:00
diego
47044eb841
Avoid u_ BSD type names.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-27 12:03:51 +00:00
Uoti Urpala
a3ab9e8e46
Merge svn changes up to r28149
2008-12-14 17:28:16 +02:00
diego
39090878e5
Replace informal GPL notes by standard GPL header.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-13 12:13:48 +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
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