summaryrefslogtreecommitdiffstats
path: root/stream
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30236Uoti Urpala2010-01-081-30/+4
|\
| * Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp://reimar2010-01-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify ffmpeg stream support, we (so far) do not need any special option ↵reimar2010-01-061-29/+3
| | | | | | | | | | | | parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30231 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30216Uoti Urpala2010-01-088-0/+14
|\|
| * Add a few missing header #includes and #defines.diego2010-01-048-0/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30207 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30195Uoti Urpala2010-01-083-4/+4
|\|
| * Disambiguate HEADER_SIZE definition in stream/librtsp and stream/realrtsp.diego2010-01-043-4/+4
| | | | | | | | | | | | | | | | | | This fixes the warning: In file included from stream/realrtsp/real.c:35: stream/realrtsp/real.h:36:1: warning: "HEADER_SIZE" redefined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30194 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30173Uoti Urpala2010-01-082-0/+21
|\|
| * Several hacks to fix compilation of tvi_dshow on MinGW64.reimar2010-01-022-0/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-081-2/+5
|\|
| * Make code slightly more readable.reimar2009-12-311-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30148 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.reimar2009-12-311-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a hack for broken youtube servers not returning Accept-Ranges.reimar2009-12-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30145 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30055Uoti Urpala2009-12-181-1/+1
|\|
| * 100l, fix check for V4L2 capture capability flag.reimar2009-12-111-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29991 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Fix printf format strings with invalid '%lf' conversionUoti Urpala2009-12-151-2/+2
| | | | | | | | | | | | | | Some code used an invalid '%lf' conversion specification for double arguments. Maybe they were written that way due to confusion with scanf where doubles are indicated by '%lf'; however it is not a valid printf format specifier. Change those cases to use '%f'.
* | Merge svn changes up to r29971Uoti Urpala2009-11-291-0/+1
|\|
| * mime type [video/x-ms-wmv] is not an ASF redirector.compn2009-11-261-0/+1
| | | | | | | | | | | | | | patch by KO Myung-Hun komh!chollian!net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29965 b3059339-0415-0410-9bf9-f77b7e298cf2
* | stream_ffmpeg: Fix reads near EOFUoti Urpala2009-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | stream_ffmpeg used libavformat's url_read_complete() to read data. However that function returns failure if it did not manage to read the _full_ amount of data asked for, while the behavior we want is to return any positive amount of data there was before end of file. This caused attempts to read the last bytes in a file to fail. Fix by using url_read() instead of url_read_complete(); even if some reads before EOF return less than the full amount that should not be a problem.
* | Merge svn changes up to r29962Uoti Urpala2009-11-2312-24/+173
|\|
| * Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyreimar2009-11-229-16/+16
| | | | | | | | | | | | | | name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l to Reimar: Fix typo.cehoyos2009-11-181-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29931 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Deobfuscate the special hack to disable cache for live555.reimar2009-11-173-2/+6
| | | | | | | | | | | | | | | | | | Cache can not be used for it, since it does not provide any data stream, the data is provided to the demuxer "behind MPlayer's back". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29930 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge malloc+memset -> callocreimar2009-11-171-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29929 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fall back to read-based seeking for ffmpeg:// URLs when is_streamed is setreimar2009-11-171-2/+2
| | | | | | | | | | | | | | (i.e. it is not possible to use url_fseek). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29928 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable the read-based forward seek fallback also when CONFIG_NETWORK isreimar2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | enabled. Enabling network support should not have side-effects on code not really related to networking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29926 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use fill_buffer if available also for STREAMTYPE_STREAMreimar2009-11-171-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29925 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add preliminary support for streaming via FFmpeg's URProtocol functions.reimar2009-11-172-0/+144
| | | | | | | | | | | | | | Basic playback tested for file and http protocols. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-1614-2174/+193
|\|
| * Move headers related to setting dvd speed to dvd_common.reimar2009-11-112-14/+19
| | | | | | | | | | | | | | This makes -dvd-speed work again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29894 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set the EOF flag when dvdnav reached the end of the requested title.reimar2009-11-111-2/+6
| | | | | | | | | | | | | | | | Otherwise it would just hang, either at the menu or trying to play the last played frame as a still frame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29893 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speedreimar2009-11-104-73/+79
| | | | | | | | | | | | | | support for dvdnav. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29890 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move arrays used by both dvd and dvdnav to dvd_common.reimar2009-11-104-5/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29889 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused extern declarations.reimar2009-11-101-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29888 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Share dvd_device extern declaration between dvd and dvdnav.reimar2009-11-103-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29887 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove an unused variable.reimar2009-11-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29886 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set demuxer->teletext to NULL when closing the TV interface,reimar2009-11-101-0/+1
| | | | | | | | | | | | | | since analog teletext can not (yet) work without the TV interface. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29873 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The code for the non-networking case is the same whether networkingreimar2009-11-091-5/+2
| | | | | | | | | | | | | | support was enabled or no, so avoid duplicating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29861 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor out triplicated break statement.reimar2009-11-091-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29860 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused mp_dvdnav_aid_from_audio_num functionreimar2009-11-091-21/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29859 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang andreimar2009-11-091-9/+13
| | | | | | | | | | | | | | | | dvdnav_get_spu_logical_stream both take the same numbering (i.e. not the ids used in the MPEG-TS). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29858 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove CONFIG_TV_TELETEXT.cehoyos2009-11-073-35/+0
| | | | | | | | | | | | | | | | DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Separate teletext from tv support.cehoyos2009-11-075-17/+31
| | | | | | | | | | | | | | Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
| * dvdnav: print ID_SID_..._LANG, just like dvd://reimar2009-11-051-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29832 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: indentation, merge two consecutive ifs.reimar2009-11-051-6/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29831 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make dvdnav also print info about audio streams with unknown language, just ↵reimar2009-11-051-1/+1
| | | | | | | | | | | | like dvd:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29830 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the dvdnav stream language information output more similar to the dvd one.reimar2009-11-051-10/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29829 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change the subtitle numbers in the dvdnav subtitle language info to matchreimar2009-11-051-1/+1
| | | | | | | | | | | | | | the numbers used by MPlayer's OSD and -sid option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29828 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace two more occurences of tvi_vbi with dec_teletext.cehoyos2009-10-311-1/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29808 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support ISDB-Tb tunning in Brazilcehoyos2009-10-301-3/+7
| | | | | | | | | | | | | | Patch by Sérgio Fortier, sergiofortier A yahoo com br git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29803 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some pathscehoyos2009-10-293-3/+3
| | | | | | | | | | | | | | | | | | in comments. Based on a patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move teletext specific code from stream into libmpcodecs.cehoyos2009-10-297-1960/+4
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix teletext character set auto-detection.cehoyos2009-10-241-1/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29796 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove some pointless parentheses from return calls.diego2009-10-083-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29644Uoti Urpala2009-09-045-18/+26
|\|
| * Fix possible crashes with invalid SDPs that result in stream descriptionsreimar2009-09-022-1/+4
| | | | | | | | | | | | | | not being initialized. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29626 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix several more rtsp-related memleaks.reimar2009-09-023-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29625 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix asmrp_dispose to also free the buffer.reimar2009-09-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29624 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc to ensure rmff_new_mdpr returns fully initialized data.reimar2009-09-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29623 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move variable declaration to where it is used.reimar2009-09-021-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29622 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure we do not strdup(NULL), avoids a crash with non-real streams.reimar2009-09-021-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29621 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix several memleaks in real_setup_and_get_headerreimar2009-09-021-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29620 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change real_setup_and_get_header to use goto a single exit path to simplifyreimar2009-09-021-11/+7
| | | | | | | |