summaryrefslogtreecommitdiffstats
path: root/stream/asf_mmst_streaming.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27374Uoti Urpala2008-07-301-10/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-10/+10
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cosmetics: Remove useless parentheses from return statements.diego2008-05-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26788 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-141-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26769 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move audio_id and video_id to options structUoti Urpala2008-04-231-1/+2
|/
* Quick hack mostly for documentation purposes to make -aid work with mms://reimar2007-02-081-0/+10
| | | | | | | Sample: mms://212.191.227.121/308gwY8TZqvHUpsq4dbZnsijbiCi9j3KsguBrfbm2FiDMlBadHuF0g0%2b1%2bUKG84F2Sl6DVTxHNtNuMxa%2f55j0imtiKswx8ev7cEYxvNuAlSBioF3nYmzTAM71xKiTHjM6%2fqejrQgFg7srIdntNoIw%2fyw%3d%3d/1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22177 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgotten closesocket on error, patch byreimar2006-12-091-1/+4
| | | | | | | Nicolas Baradakis <nbk sitadelle com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21552 b3059339-0415-0410-9bf9-f77b7e298cf2
* Restore original copyright notice as found in xine and xine-mms where thisdiego2006-09-181-7/+27
| | | | | | | code originated. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19888 b3059339-0415-0410-9bf9-f77b7e298cf2
* isolated tcp socket code from network.c to a dedicated fileben2006-08-051-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19341 b3059339-0415-0410-9bf9-f77b7e298cf2
* proper inclusion of demuxer.h (including libmpdemux in Makefile only was to ↵ben2006-08-041-1/+1
| | | | | | make previous split easier) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19318 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-0/+665
split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2