summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Factorizes dvdnav aid retrieval code.ben2008-06-071-30/+27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27022 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add routine that provides audio ID corresponding to logical numberben2008-06-072-0/+33
| | | | | | | | | | | | | | | | in dvdnav stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27021 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename some functions as they are mplayer related and notben2008-06-072-15/+15
| | | | | | | | | | | | | | | | from libdvdnav public API. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27018 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename for consistencyben2008-06-071-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27017 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add routine to determine if SPU has changed in dvdnav stream.ben2008-06-072-0/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27016 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add routine to determine if audio has changed in dvdnav stream.ben2008-06-072-0/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27015 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Save DVDNAV palette info.ben2008-06-072-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27005 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-0419-209/+312
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 100l, fix wrong order of cases in cache_do_controlreimar2008-06-011-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26956 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation with internal dvdnavrtogni2008-05-311-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26939 b3059339-0415-0410-9bf9-f77b7e298cf2
| * adapted to the dvdread->libdvdread transition in dvdnav's repositorynicodvb2008-05-313-4/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26938 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle NULL control function in cache_execute_control, fixes crash with http ↵reimar2008-05-301-0/+7
| | | | | | | | | | | | urls. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26929 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.reimar2008-05-261-2/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26879 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add basic support for stream controls with cache enabled.reimar2008-05-244-7/+83
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26865 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove useless parentheses from return statements.diego2008-05-1612-198/+198
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26788 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-1518-233/+263
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Add missing stream.h #include, fixes the warning:diego2008-05-151-0/+1
| | | | | | | | | | | | | | stream/tcp.c:197: warning: implicit declaration of function 'stream_check_interrupt' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26783 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use standard license headers with standard formatting.diego2008-05-1417-233/+262
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26769 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26680Uoti Urpala2008-05-072-0/+3
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Add missing header #includes to fix 'make checkheaders'.diego2008-05-032-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26663 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Create a context for input.c stateUoti Urpala2008-04-302-4/+11
| | | | | | | | | | | | | | | | | | Start moving static variables to a context struct. Only autorepeat state is moved to the struct in this commit. mp_input_check_interrupt now requires the context variable. Change stream functions to pass it. It's still stored in a static variable in stream/.
* | Merge svn changes up to r26587Uoti Urpala2008-04-291-1/+1
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Use consistent #include paths without "../".diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26540Uoti Urpala2008-04-261-73/+0
|\| | | | | | | | | | | Conflicts: Makefile
| * Merge stream/Makefile into top-level Makefile.diego2008-04-241-72/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: alphabetical orderdiego2008-04-241-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26513 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-256-29/+29
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | Move audio_id and video_id to options structUoti Urpala2008-04-233-10/+14
| |
* | Add option pointer to stream struct (at least temporarily)Uoti Urpala2008-04-233-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The stream code does not access many option variables directly, but it does access some such as audio_id and network_bandwidth (and does that without including proper headers for them). Add option pointer to the stream struct to allow access to those variables. Remove the unused (always NULL) and clumsy-looking char** options parameter in the open_stream call and replace it with the option pointer. The parameter is currently only set in the main open_stream() call in MPlayer.c and not in any other locations that can open a stream. In the long term it might be better to pass a more limited set of values somehow, but this should do for now.
* | Mark some functions staticUoti Urpala2008-04-232-5/+5
|/ | | | | | These functions aren't used outside their file and have no prototype in any header. Based on a forgotten patch from 2006 by Stefan Huehner, (stefan huehner org).
* in preparation for multi-frontend patch replaced file-static device names ↵nicodvb2008-04-131-17/+28
| | | | | | with sprintf() calls in 2 functions git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26433 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless parameter :type from -dvbin (the frontend type is reported ↵nicodvb2008-04-121-6/+3
| |