diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
| commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
| tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /stream | |
| parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
| parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
| download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz | |
Merge svn changes up to r27899
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/dvb_tune.c | 4 | ||||
| -rw-r--r-- | stream/http.c | 3 | ||||
| -rw-r--r-- | stream/network.c | 3 | ||||
| -rw-r--r-- | stream/stream_dvb.c | 4 | ||||
| -rw-r--r-- | stream/tvi_dshow.h | 1 |
5 files changed, 9 insertions, 6 deletions
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c index b42d69d17e..b631e13e73 100644 --- a/stream/dvb_tune.c +++ b/stream/dvb_tune.c @@ -117,9 +117,7 @@ int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt) mp_msg(MSGT_DEMUX, MSGL_ERR, "ERROR OPENING FRONTEND DEVICE %s: ERRNO %d\n", frontend_dev, errno); return 0; } -#ifdef CONFIG_DVB_HEAD - priv->sec_fd=0; -#else +#ifndef CONFIG_DVB_HEAD priv->sec_fd = open(sec_dev, O_RDWR); if(priv->sec_fd < 0) { diff --git a/stream/http.c b/stream/http.c index 2a6d07aee0..fa8b4e9d35 100644 --- a/stream/http.c +++ b/stream/http.c @@ -550,6 +550,7 @@ http_set_field( HTTP_header_t *http_hdr, const char *field_name ) { new_field->field_name = malloc(strlen(field_name)+1); if( new_field->field_name==NULL ) { mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n"); + free(new_field); return; } strcpy( new_field->field_name, field_name ); @@ -972,7 +973,7 @@ const stream_info_t stream_info_http1 = { "Bertrand, Albeau, Reimar Doeffinger, Arpi?", "plain http", open_s1, - {"http", "http_proxy", "unsv", "icyx", NULL}, + {"http", "http_proxy", "unsv", "icyx", "noicyx", NULL}, NULL, 0 // Urls are an option string }; diff --git a/stream/network.c b/stream/network.c index 6e000c07f2..5cfe4a461e 100644 --- a/stream/network.c +++ b/stream/network.c @@ -205,7 +205,8 @@ http_send_request( URL_t *url, off_t pos ) { else http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); - http_set_field(http_hdr, "Icy-MetaData: 1"); + if( strcasecmp(url->protocol, "noicyx") ) + http_set_field(http_hdr, "Icy-MetaData: 1"); if(pos>0) { // Extend http_send_request with possibility to do partial content retrieval diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 5068fd0dbb..78bc8a9309 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -611,9 +611,10 @@ static void dvbin_close(stream_t *stream) close(priv->dvr_fd); close(priv->fe_fd); -#ifdef CONFIG_DVB +#ifndef CONFIG_DVB_HEAD close(priv->sec_fd); #endif + priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1; priv->is_on = 0; dvb_free_config(priv->config); @@ -685,6 +686,7 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format) return STREAM_ERROR; priv = (dvb_priv_t *)stream->priv; + priv->fe_fd = priv->sec_fd = priv->dvr_fd = -1; priv->config = dvb_get_config(); if(priv->config == NULL) { diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h index bc347e5930..784bcfb0c2 100644 --- a/stream/tvi_dshow.h +++ b/stream/tvi_dshow.h @@ -5,6 +5,7 @@ #define INITGUID #include <inttypes.h> +#include <windows.h> //#include <ole2.h> #include <vfw.h> #include "loader/dshow/mediatype.h" |