summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | by the card) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26423 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed defunct options :vid and :aid from -dvbin (they were useless from ↵nicodvb2008-04-121-10/+5
| | | | | | the start) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26422 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the need for code using stream to export an mp_input_check_interrupt()albeu2008-04-094-4/+18
| | | | | | | function. It also removes the compile-time dependency on input. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26358 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make stream independent of libmpdemux, the asf demuxer and streamingalbeu2008-04-091-10/+1
| | | | | | | code share a function and a few definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix possible integer overflow in malloc by using calloc instead.reimar2008-03-291-1/+2
| | | | | | | Should fix CVE-2008-0073 as far as MPlayer is affected by this problem. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26299 b3059339-0415-0410-9bf9-f77b7e298cf2
* mingw uses windows sockets.vayne2008-03-111-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26223 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-101-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26218 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-1014-0/+39
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26216 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless #include.diego2008-03-101-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26215 b3059339-0415-0410-9bf9-f77b7e298cf2
* search channels.conf in mplayer's instdir if all other searches fail; patch ↵nicodvb2008-03-031-0/+6
| | | | | | by foxcore gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26155 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache support for OS/2diego2008-02-281-17/+34
| | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26109 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a pointless special-case for opening a filereimar2008-02-241-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26083 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-2234-106/+104
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add multiple inclusion guard.diego2008-02-211-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26045 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing multiple inclusion guards.diego2008-02-214-0/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26044 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-26/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for DOS-style file:///x:/path paths.diego2008-02-201-0/+6
| | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26037 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill stream->end_pos if possible, fixing lavf demuxers that need to seek.albeu2008-02-191-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26031 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support icyx://.reimar2008-02-151-1/+1
| | | | | | | Patch by Sander Plas [sander oele net]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26004 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always display Icy-Metadata if available, whether we recognize an ICY-Serverreimar2008-02-151-1/+2
| | | | | | | or not. I can not think of a reason why this should hurt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26003 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move printing of Icy-Metadata into an extra functionreimar2008-02-151-14/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26002 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless codereimar2008-02-151-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26001 b3059339-0415-0410-9bf9-f77b7e298cf2
* Detect IceCast also by Icy-MetaInt header part in http_streaming_start(),reimar2008-02-151-1/+2
| | | | | | | as in fixup_open() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26000 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-142-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* -chapter is now handled uniformly calling demuxer_seek_chapter() insteadnicodvb2008-02-112-29/+2
| | | | | | | of letting individual demuxers and stream readers do their nasty job git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
* #include just libavutil/common.h, not all of libavutil/intreadwrite.h.diego2008-02-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25980 b3059339-0415-0410-9bf9-f77b7e298cf2
* Stream IDs must be written as hex numbers. Fixes rtogni2008-01-291-2/+2
| | | | | | | | | http://wm.streampower.be/ceu/archive/CEU_COUNCIL_DELIBIRATIONS_PUBLIC_DEBATE/ceulive_1443.wmv Patch by Peter Collingbourne pcc03 doc ic ac uk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25928 b3059339-0415-0410-9bf9-f77b7e298cf2
* vcd_read must read exactly VCD_SECTOR_DATA bytes.reimar2008-01-281-1/+1
| | | | | | | | If NetBSD can not handle this setting, the code must be rewritten to use a temporary buffer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25901 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistently use uppercase filename as multiple inclusion guard.diego2008-01-285-15/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
* factorize 2 testsben2008-01-261-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25860 b3059339-0415-0410-9bf9-f77b7e298cf2
* add a new state flag to dvdnav in order to notify ifben2008-01-262-0/+21
| | | | | | | | | something has changed in the current stream (being title, chapter, audio layer or SPU one) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25858 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove useless castsben2008-01-261-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25857 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplify by a one-linerben2008-01-261-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25856 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove the spu_set field, replaced by a flagben2008-01-261-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25855 b3059339-0415-0410-9bf9-f77b7e298cf2
* this end brace was not correctly indentedben2008-01-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25854 b3059339-0415-0410-9bf9-f77b7e298cf2
* automatically set spu button highlight when nav cell has changedben2008-01-261-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25853 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for dvdnav still frames playback.ben2008-01-262-26/+166
| | | | | | | | | | | Based on various patches from Otvos Attila and MPlayer'ized by me. N.B. Always use -vc ffmpeg12 with dvdnav:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25852 b3059339-0415-0410-9bf9-f77b7e298cf2
* array was defined for 6 elements while 7 were declaredben2008-01-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25848 b3059339-0415-0410-9bf9-f77b7e298cf2
* type expected by dvdnav_get_title_string() is constben2008-01-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25847 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove some redundant declarationsben2008-01-241-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25846 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add new command to switch between dvdnav titlesben2008-01-242-0/+10
| | | | | | | | Based on parts of dvdnav monster patches from Otvos Attila git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25845 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prevent possible buffer overflow on album_title[]rtogni2008-01-201-2/+5
| | | | | | | Based on a patch by Adam Bozanich abozanich musecurity com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25824 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clear tmp between ip6 check and string escape to prevent reuse of the rtogni2008-01-201-0/+1
| | | | | | | |