Commit Graph

28 Commits

Author SHA1 Message Date
diego 788a4d5f91 Move '#define closesocket close' preprocessor directive to a common place
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
2008-09-01 07:31:57 +00:00
diego f27f04a53d Revert moving closesocket definition and network headers to network.h.
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
2008-08-31 13:59:54 +00:00
diego c152b07e66 Move duplicated '#define closesocket close' into network.h along with
network-related #include #ifdeffery.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:55:39 +00:00
diego 3af860b877 Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
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
2008-08-29 20:05:08 +00:00
albeu 67352a6575 Fill stream->end_pos if possible, fixing lavf demuxers that need to seek.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-19 18:04:10 +00:00
reimar 24a3faf378 Support icyx://.
Patch by Sander Plas [sander oele net].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 21:21:10 +00:00
reimar 4114557255 Always display Icy-Metadata if available, whether we recognize an ICY-Server
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
2008-02-15 20:32:45 +00:00
reimar 367419a18b Move printing of Icy-Metadata into an extra function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26002 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:31:10 +00:00
reimar 48614bcc10 Remove useless code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26001 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:23:59 +00:00
reimar de2ae95def Detect IceCast also by Icy-MetaInt header part in http_streaming_start(),
as in fixup_open()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26000 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:20:16 +00:00
reimar 7afc929e2a mime_type_table is const as well
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25274 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 22:12:50 +00:00
reimar 15cddcd511 Preserve unsv:// protocol specifier over http redirects.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25266 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 18:24:01 +00:00
reimar cd3d3369e1 Mark all stream_info_t as const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25239 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 13:22:53 +00:00
ulion 0bb30d41b3 Support stream redirection from http to mms, fix bug #927.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25163 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-26 00:41:21 +00:00
diego 01d92a32ad cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 22:38:45 +00:00
uau 152284fb0f Fix base64_encode() max output length checking.
Made HTTP auth fail if sum of username+password lengths was below 3.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22049 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 19:25:03 +00:00
iive a36aff154c Fix double free of *http_hdr at server error.
In http.c::http_streaming_start() *http_hdr is allocated
then assigned to stream->streaming_ctrl->data
if server returns error *http_hdr is freed before function returns.
However the copy in ->data remains and is
later freed (again) by network.c::streaming_ctrl_free().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21792 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-30 13:23:39 +00:00
reimar 12e48b5cd0 Make sure closesocket is called.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21583 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 19:47:24 +00:00
reimar 6a2fc8dd2c STREAM_UNSUPPORTED is -1, so use the former for return value in all places.
Thanks to Nicolas Baradakis (nbk sitadelle com) for noticing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21582 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 19:38:41 +00:00
reimar ee08a2d2d3 Make sure stream->fd is set correct (esp. to -1 on error when fd is closed)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21581 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-10 19:35:39 +00:00
reimar f847af0e29 Fix misplaced http_free
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21558 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 19:50:08 +00:00
reimar fd020fc4f7 Fix potential endless loop in http_streaming_start due
to not resetting redirect.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21557 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 19:34:46 +00:00
reimar 5129d87b43 Fix lots and lots of potential memory/fd leaks in http_streaming_start
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21556 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 19:33:28 +00:00
reimar c407b9b070 Support URL redirections that do not specify full URL.
Fixes crash with mplayer -playlist http://www.radioseven.se/radioseven.pls.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20800 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 22:42:31 +00:00
diego fcd45c5111 slight overall verbosity reduction
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20191 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 22:24:19 +00:00
reimar df3b9f3b24 Handle 303 (See Other) redirect, part of a patch by Benjamin Zores (ben at geexbox org)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19465 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-20 11:47:33 +00:00
ben 2410b87a64 proper inclusion of demuxer.h (including libmpdemux in Makefile only was to make previous split easier)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19318 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 17:01:29 +00:00
ben 49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00