Commit Graph

51 Commits

Author SHA1 Message Date
cehoyos c99d8fc898 stream: http: Allow setting custom http header
Patch by Nikolay Nikolaev, nicknickolaev yahoo com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33082 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-04-13 03:17:05 +03:00
cboesch 1737297b58 stream/http: Add support for login/password in http_proxy env variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32673 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 05:19:17 +02:00
cboesch a9b5a9348d stream/network.c, stream/http.c: cleanup
Simplify mime_type_table loop

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32644 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove dead define

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32645 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove GCC warning hack not needed anymore

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32646 b3059339-0415-0410-9bf9-f77b7e298cf2

Use calloc instead of malloc+memset.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32647 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 04:29:20 +02:00
cboesch 9bf59a1fcb stream/http: Do not keep authentication in URL when proxied
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32640 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 04:27:56 +02:00
cboesch 8ffe2c9afe stream/http: Add Proxy-Authorization header to authenticate on proxies
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32634 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 04:13:16 +02:00
cboesch 3073eaa8d3 stream/http: don't use proxy values for "Authorization" header
"Authorization" header is for the destination server URL, even through
a proxy.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32633 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 04:12:36 +02:00
cboesch cd66de0b8a stream/network.c: Replace hardcoded str size with sizeof
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32603 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:09:47 +02:00
diego 12d3e0df99 cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
reimar 56d122a6db stream_network: Fix possible crash for invalid http_proxy URLs
Check for URLs like just "http_proxy://".

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32508 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
Uoti Urpala c5e462b33d build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc
together (libavutil is always required).

based on svn commit by diego:

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego a1b8092c87 Factorize MPlayer/MEncoder version string handling.
The string now resides in a central object file instead of
being duplicated in every file that requires a version string.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar 41d25ebcc8 stream: Use MSG_NOSIGNAL flag if available for send().
This avoids MPlayer quitting due to SIGPIPE at least for these cases.
Ignoring SIGPIPE in general would break window-closing with some
window-managers.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31566 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
Uoti Urpala 497c32cdad Merge svn changes up to r31291 2010-06-02 18:55:18 +03:00
reimar 326ec00733 Add a referrer option to set the HTTP Referer field.
Patch by chocolateboy [chocolate cpan org]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31288 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:50:02 +00:00
Uoti Urpala 4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
reimar f76e141402 Make http_read_response fail if parsing the response failed.
Avoids possible crashes since other code assumes http_hdr->protocol
is a valid string if it succeeds.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30951 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:45:33 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala 327463be52 Merge svn changes up to r30672 2010-03-10 00:34:16 +02:00
Uoti Urpala 13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala 8e593f5a34 Merge svn changes up to r30529 2010-03-09 22:47:41 +02:00
Uoti Urpala 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
cehoyos f47d90850d Remove unused static function streaming_stop().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30765 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 20:13:21 +00:00
reimar b1e549d7bc Print response headers as debugging output also for HTTP seeks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30670 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 19:23:14 +00:00
reimar 4b36e2fd18 10l, fix a close() that should be a closesocket()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30669 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 19:22:23 +00:00
reimar bb54613ac1 Fix mov reference files: for video/quicktime mime do not force a demuxer
but do autodetection. This tries lavf first but will also try native demuxer
for reference files where open fails for the lavf demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30663 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 11:48:41 +00:00
diego 2c8f5fa622 stream: Mark functions not used outside of their files as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30599 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-16 16:32:38 +00:00
reimar de41d79d2c Prefer libavformat over our own mov demuxer also for video/quicktime
mime-type.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30517 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-05 17:35:48 +00:00
diego 59e26907b6 Add license header to all files missing it in the stream subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 22:26:47 +00:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego 0f65d3be9d Convert HAVE_WINSOCK2_H into a 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:42:27 +00:00
reimar a2cd1d4d04 Forgotten reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27882 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 17:15:44 +00:00
reimar 863a334a9f Add a noicyx:// protocol to allow easier testing for misconfigured servers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27881 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 17:15:14 +00:00
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
diego 4b141479da Start unifying names of internal preprocessor directives.
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
2008-07-30 12:01:30 +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
rtogni 59a387a829 wvx files (mimetype video/x-ms-wvx) are asx playlists. Fix bugzilla #750
http://www.ntt-fukushima.com/sora/mado_live/jr_aizu/gazai/jrwaka500k.wvx 

Patch by Sergey Svishchev | svs ropnet ru | on bugzilla


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23695 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-29 21:21:57 +00:00
rathann 45defa1aa0 Fix a few gcc warnings, approved by Diego and Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:46:08 +00:00
rtogni df3d2e16f1 Force lavf on flv streams. Closes bugzilla #354
Fixes http://portal.vpod.tv/jmbillaut/11439/stream/cdn
Patch based on a suggestion by compn


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21628 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-15 23:09:01 +00:00
reimar 5adaad47de Close fd on error.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21551 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-09 18:54:12 +00:00
eugeni 31732df54d Change demuxer for "application/octet-stream" http streams from
ASF to UNKNOWN (autodetect).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19847 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-15 21:34:38 +00:00
ben d7b460956a isolated tcp socket code from network.c to a dedicated file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19341 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-05 10:30:06 +00:00
ben 5a85fcf1d8 kill a warning in getsockopt()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19337 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-05 08:56:54 +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