summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27514Uoti Urpala2008-09-0331-91/+89
|\
| * Move '#define closesocket close' preprocessor directive to a common placediego2008-09-0114-23/+17
| | | | | | | | | | | | | | 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
| * Revert moving closesocket definition and network headers to network.h.diego2008-08-3114-15/+115
| | | | | | | | | | | | | | 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
| * Rename internal libdvdread fork from dvdread to libdvdreadrathann2008-08-303-12/+12
| | | | | | | | | | | | | | | | 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
| * Print DVD volume ID with -identify.reimar2008-08-301-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move duplicated '#define closesocket close' into network.h along withdiego2008-08-2914-115/+15
| | | | | | | | | | | | | | network-related #include #ifdeffery. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
| * consistency cosmetics: Avoid using .. in #include paths.diego2008-08-296-12/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.diego2008-08-2920-45/+46
| | | | | | | | | | | | | | | | | | 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
| * Use '#include <poll.h>' instead of '#include <sys/poll.h>'.diego2008-08-143-3/+3
| | | | | | | | | | | | | | 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
* | Make various functions staticUoti Urpala2008-08-122-4/+4
| |
* | Include corresponding .h in some .c filesUoti Urpala2008-08-121-0/+1
| |
* | stream.h: Add 2 prototypes instead of declaring them in cache2.cUoti Urpala2008-08-122-5/+2
| | | | | | | | | | | | | | 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.
* | Merge svn changes up to r27441Uoti Urpala2008-08-0816-114/+114
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-072-8/+8
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename font-related preprocessor directives.diego2008-08-071-7/+7
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename a bunch of miscellaneous preprocessor directives.diego2008-08-073-13/+13
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.diego2008-08-065-17/+17
| | | | | | | | | | | | | | 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
| * Rename some audio-output-related preprocessor directives.diego2008-08-055-17/+17
| | | | | | | | | | | | | | 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
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-0310-69/+69
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-025-16/+16
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-014-15/+15
| | | | | | | | | | | | | | 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
| * Rename two GUI-related preprocessor directives:diego2008-07-301-1/+1
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r27374Uoti Urpala2008-07-3015-55/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Start unifying names of internal preprocessor directives.diego2008-07-3014-54/+54
| | | | | | | | | | | | | | | | 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
| * Do not include sys/socket.h when using winsock2, it is pointlessreimar2008-07-261-1/+2
| | | | | | | | | | | | and breaks compilation under MinGW. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27352 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Uoti Urpala2008-07-214-5/+7
|\|
| * Our ALSA code needs alloca, so check for it in configure and include alloca.hreimar2008-07-172-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace S_IREAD|S_IWRITE by POSIX-compatible S_IRUSR|S_IWUSR (not exactly ↵reimar2008-07-151-1/+1
| | | | | | | | | | | | the same, but should not matter). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27289 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove -std=gnu99/gnu89/default dialect linux define, as it violates themichael2008-07-151-4/+4
| | | | | | | | | | | | | | C standard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27281Uoti Urpala2008-07-152-2/+2
|\|
| * in dvd streams the title part ranges from 1 to 99nicodvb2008-07-122-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27267 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27242Uoti Urpala2008-07-095-1/+15
|\| | | | | | | | | | | | | Conflicts: Makefile configure
| * Add missing #include <sys/socket.h>, fixes the warnings:diego2008-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | 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
| * avoid unnecessary strdup(); patch by Aurelnicodvb2008-07-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Surround stream cache specific code by an appropriate #ifdef; fixes linkingdiego2008-07-051-0/+2
| | | | | | | | | | | | | | | | 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
| * Add some more -identify information for CDDB.diego2008-07-051-0/+9
| | | | | | | | | | | | | | patch by Mathieu Schroeter, mathieu.schroeter gamesover ch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27207 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add disc ID to -identify output.diego2008-07-051-0/+2
| | | | | | | | | | | | | | patch by Mathieu Schroeter, mathieu.schroeter gamesover ch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27206 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Uoti Urpala2008-07-052-18/+25
|\|
| * Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.diego2008-07-041-0/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: in ifo_stream_oped() aligned the prototype to the stylenicodvb2008-07-041-9/+8
| | | | | | | | | | | | | | | | | | 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
| * in ifo_stream_open() propagate the device based on the dirname of ↵nicodvb2008-07-041-0/+1
| | | | | | | | | | | | 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
| * dvd_device must be handled exclusively by the option parser; it can't be ↵nicodvb2008-07-041-2/+0
| | | | | | | | | | | | changed at will in ifo_stream_open() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27196 b3059339-0415-0410-9bf9-f77b7e298cf2
| * added support for the device part in the url; patch bynicodvb2008-07-041-8/+17
| | | | | | | | | | | | | | Mathieu SCHROETER mathieu.schroeter gamesover ch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27195 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27184Uoti Urpala2008-07-015-106/+122
|\|
| * Try to get frame rate information through VIDIOC_G_PARM ifvoroshil2008-06-301-0/+12
| | | | | | | | | | | | | | | | 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
| * Fix division by zero in tvi_v4l2 which occures when capture devicevoroshil2008-06-301-8/+18
| | | | | | | | | | | | | | 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
| * removed struct dvdnav_event_t that is 1) unused; 2) has an improper name. ↵nicodvb2008-06-291-6/+0
| | | | | | | | | | | | You can't turn your back for a second... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27157 b3059339-0415-0410-9bf9-f77b7e298cf2
| * mingw uses Windows sockets.vayne2008-06-281-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27141 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix the issue instead of revertinglu_zero2008-06-253-58/+56
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27136 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move rtsp_close away by simplification - avoids symbol clash with libnemesilu_zero2008-06-253-33/+33
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27135 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27123Uoti Urpala2008-06-231-27/+28
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * Reorder some functions to avoid implicit declaration warnings.diego2008-06-191-27/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27099 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27092Uoti Urpala2008-06-174-6/+34
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * Add missing #includes to fix 'make checkheaders'.diego2008-06-162-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Ability for specifying TV standard individually for each TV channel.voroshil2008-06-142-6/+32
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r27025Uoti Urpala2008-06-072-36/+118
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c