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
fb2b4dea1c
Do not include sys/socket.h when using winsock2, it is pointless
...
and breaks compilation under MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-26 20:58:50 +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
reimar
803385a5d7
Replace S_IREAD|S_IWRITE by POSIX-compatible S_IRUSR|S_IWUSR (not exactly the same, but should not matter).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27289 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 17:35:52 +00:00
michael
0589f47239
Remove -std=gnu99/gnu89/default dialect linux define, as it violates the
...
C standard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 00:21:32 +00:00
Uoti Urpala
92f0cba26b
Merge svn changes up to r27281
2008-07-15 02:59:27 +03:00
nicodvb
b16d3fd6c2
in dvd streams the title part ranges from 1 to 99
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27267 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 08:07:54 +00:00
Uoti Urpala
ca3feba5c3
Merge svn changes up to r27242
...
Conflicts:
Makefile
configure
2008-07-09 18:32:51 +03:00
diego
3a0ee8a23a
Add missing #include <sys/socket.h>, fixes the warnings:
...
stream/librtsp/rtsp.c: In function 'write_stream':
stream/librtsp/rtsp.c:68: warning: implicit declaration of function 'send'
stream/librtsp/rtsp.c: In function 'read_stream':
stream/librtsp/rtsp.c:95: warning: implicit declaration of function 'recv'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27234 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-08 08:20:39 +00:00
nicodvb
efb1379f72
avoid unnecessary strdup(); patch by Aurel
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 18:04:14 +00:00
diego
0b2ed65981
Surround stream cache specific code by an appropriate #ifdef; fixes linking
...
when stream cache is disabled.
noticed by Andrea Palmatè, andrea amigasoft net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27210 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 14:22:57 +00:00
diego
462fa761e5
Add some more -identify information for CDDB.
...
patch by Mathieu Schroeter, mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27207 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 11:44:13 +00:00
diego
dfa733c50b
Add disc ID to -identify output.
...
patch by Mathieu Schroeter, mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27206 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 11:39:43 +00:00
Uoti Urpala
8ea134bd23
Merge svn changes up to r27202
2008-07-05 02:55:56 +03:00
diego
f3bf43f443
Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 20:14:00 +00:00
nicodvb
a4b4b991dc
cosmetics: in ifo_stream_oped() aligned the prototype to the style
...
of the rest of the file and renamed dvd_priv to spriv
(it's a stream_priv_s*, while dvd_priv is used for other
purposes in the rest of the file)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27198 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:03:57 +00:00
nicodvb
8742c266db
in ifo_stream_open() propagate the device based on the dirname of stream->url; patch by Mathieu SCHROETER mathieu.schroeter gamesover ch
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:00:07 +00:00
nicodvb
7043b6d0d1
dvd_device must be handled exclusively by the option parser; it can't be changed at will in ifo_stream_open()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27196 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:57:33 +00:00
nicodvb
93b837f0a7
added support for the device part in the url; patch by
...
Mathieu SCHROETER mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:54:45 +00:00
Uoti Urpala
7de350c673
Merge svn changes up to r27184
2008-07-01 16:18:21 +03:00
voroshil
6077530ac2
Try to get frame rate information through VIDIOC_G_PARM if
...
capture device driver (such as uvcvideo USB video driver) does
not provide VIDIOC_G_STD ioctl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27171 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-30 17:46:27 +00:00
voroshil
fddbd84992
Fix division by zero in tvi_v4l2 which occures when capture device
...
driver (such as uvcvideo USB video driver) does not provide VIDIOC_G_STD ioctl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27170 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-30 17:42:35 +00:00
nicodvb
ec8c4471ef
removed struct dvdnav_event_t that is 1) unused; 2) has an improper name. You can't turn your back for a second...
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 13:14:02 +00:00
vayne
08c1e65e27
mingw uses Windows sockets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27141 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-28 19:32:35 +00:00
lu_zero
4989f301f1
Fix the issue instead of reverting
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27136 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-25 13:03:18 +00:00
lu_zero
401c4717b9
Move rtsp_close away by simplification - avoids symbol clash with libnemesi
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27135 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-25 09:53:45 +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
diego
864dc16140
Reorder some functions to avoid implicit declaration warnings.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27099 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-19 07:13:50 +00: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
diego
8f044ad84b
Add missing #includes to fix 'make checkheaders'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27075 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 08:40:01 +00:00
voroshil
5fc5e26c3b
Ability for specifying TV standard individually for each TV channel.
...
Slightly modified patch by Ildar devel at pop3 dot ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27057 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-14 09:14:16 +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
883dfcb409
Factorizes dvdnav aid retrieval code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27022 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:13:15 +00:00
ben
9b52abcb8b
Add routine that provides audio ID corresponding to logical number
...
in dvdnav stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27021 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:06:27 +00: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
ben
51880f9029
rename for consistency
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27017 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:42:40 +00:00
ben
c655b2d499
Add routine to determine if SPU has changed in dvdnav stream.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27016 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:42:00 +00:00
ben
a5d9a2b2b0
Add routine to determine if audio has changed in dvdnav stream.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27015 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:37:32 +00:00
ben
d0bfe9916c
Save DVDNAV palette info.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:30:49 +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
reimar
9c6a2cb740
100l, fix wrong order of cases in cache_do_control
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26956 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-01 18:14:56 +00:00
rtogni
44111a3753
Fix compilation with internal dvdnav
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26939 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-31 13:42:09 +00:00
nicodvb
c2ed18b40b
adapted to the dvdread->libdvdread transition in dvdnav's repository
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26938 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-31 12:52:55 +00:00
reimar
09b97f4826
Handle NULL control function in cache_execute_control, fixes crash with http urls.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26929 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 15:20:42 +00:00
reimar
8e218ff329
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26879 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-26 18:46:13 +00:00
reimar
5560a0b358
Add basic support for stream controls with cache enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26865 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 07:48:35 +00:00
diego
c657594049
cosmetics: Remove useless parentheses from return statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:43:15 +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