diff options
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/asf_mmst_streaming.c | 4 | ||||
| -rw-r--r-- | stream/network.c | 6 | ||||
| -rw-r--r-- | stream/stream_cddb.c | 2 | ||||
| -rw-r--r-- | stream/stream_dvd.h | 2 | ||||
| -rw-r--r-- | stream/stream_dvdnav.c | 2 | ||||
| -rw-r--r-- | stream/stream_file.c | 2 | ||||
| -rw-r--r-- | stream/tcp.c | 8 |
7 files changed, 17 insertions, 9 deletions
diff --git a/stream/asf_mmst_streaming.c b/stream/asf_mmst_streaming.c index a32938a871..4e7b2eb2c7 100644 --- a/stream/asf_mmst_streaming.c +++ b/stream/asf_mmst_streaming.c @@ -43,10 +43,6 @@ #include <winsock2.h> #endif -#ifndef CONFIG_SETLOCALE -#undef CONFIG_ICONV -#endif - #ifdef CONFIG_ICONV #include <iconv.h> #endif diff --git a/stream/network.c b/stream/network.c index 5802b85c67..3a0a18b622 100644 --- a/stream/network.c +++ b/stream/network.c @@ -71,7 +71,11 @@ const mime_struct_t mime_type_table[] = { #ifdef CONFIG_LIBAVFORMAT // Flash Video { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, - { "video/quicktime", DEMUXER_TYPE_LAVF_PREFERRED }, + // do not force any demuxer in this case! + // we want the lavf demuxer to be tried first (happens automatically anyway), + // but for mov reference files to work we must also try + // the native demuxer if lavf fails. + { "video/quicktime", 0 }, #endif // MP3 streaming, some MP3 streaming server answer with audio/mpeg { "audio/mpeg", DEMUXER_TYPE_AUDIO }, diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 0c1bc0ccc6..2b84fc620f 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -60,7 +60,7 @@ #include <sys/cdio.h> #elif defined(__MINGW32__) || defined(__CYGWIN__) #include <ddk/ntddcdrm.h> -#elif (__bsdi__) +#elif defined(__bsdi__) #include <dvd.h> #elif defined(__APPLE__) || defined(__DARWIN__) #include <IOKit/storage/IOCDTypes.h> diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 567d122ba7..1e6c80163a 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -26,6 +26,7 @@ #include <dvdread/ifo_read.h> #include <dvdread/nav_read.h> #include "stream.h" +#include "m_option.h" typedef struct { dvd_reader_t *dvd; @@ -61,5 +62,6 @@ int dvd_lang_from_sid(stream_t *stream, int id); int dvd_aid_from_lang(stream_t *stream, unsigned char* lang); int dvd_sid_from_lang(stream_t *stream, unsigned char* lang); int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); +int dvd_parse_chapter_range(const m_option_t *conf, const char *range); #endif /* MPLAYER_STREAM_DVD_H */ diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index d365301b77..1ce40f5275 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -132,12 +132,10 @@ static dvdnav_priv_t * new_dvdnav_stream(char * filename) { dvdnav_set_readahead_flag(priv->dvdnav, 0); if(dvdnav_set_PGC_positioning_flag(priv->dvdnav, 1) != DVDNAV_STATUS_OK) mp_msg(MSGT_OPEN,MSGL_ERR,"stream_dvdnav, failed to set PGC positioning\n"); -#if 1 /* report the title?! */ if (dvdnav_get_title_string(priv->dvdnav,&title_str)==DVDNAV_STATUS_OK) { mp_msg(MSGT_IDENTIFY, MSGL_INFO,"Title: '%s'\n",title_str); } -#endif //dvdnav_event_clear(priv); diff --git a/stream/stream_file.c b/stream/stream_file.c index da9f70af44..e2114d490e 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -130,7 +130,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) { return STREAM_ERROR; } -#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__) +#if HAVE_DOS_PATHS // extract '/' from '/x:/path' if( filename[ 0 ] == '/' && filename[ 1 ] && filename[ 2 ] == ':' ) filename++; diff --git a/stream/tcp.c b/stream/tcp.c index 1bc536d41a..2222cca1db 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -99,6 +99,14 @@ connect2Server_with_af(char *host, int port, int af,int verb) { struct timeval to; #endif +#if HAVE_WINSOCK2_H && defined(HAVE_AF_INET6) + // our winsock name resolution code can not handle IPv6 + if (af == AF_INET6) { + mp_msg(MSGT_NETWORK, MSGL_WARN, "IPv6 not supported for winsock2\n"); + return TCP_ERROR_FATAL; + } +#endif + socket_server_fd = socket(af, SOCK_STREAM, 0); |