From adb50da1d7e58ffb175d3c75815a6abdf14c4e64 Mon Sep 17 00:00:00 2001 From: bertrand Date: Wed, 19 Dec 2001 09:04:03 +0000 Subject: [PATCH] If the demuxer type is unknown it will start an http streaming. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3605 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/network.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libmpdemux/network.c b/libmpdemux/network.c index a28ed9d67d..570cbfc2fe 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -44,7 +44,6 @@ static struct { { "video/x-ms-wvx", DEMUXER_TYPE_ASF }, { "video/x-ms-wmv", DEMUXER_TYPE_ASF }, { "video/x-ms-wma", DEMUXER_TYPE_ASF }, - { "text/plain", DEMUXER_TYPE_ASF }, // This is the mime type that a web server send when sending a raw asf without streaming encapsulation. }; static struct { @@ -450,16 +449,22 @@ streaming_start(stream_t *stream, URL_t *url, int demuxer_type) { // Need to filter the network stream. // ASF raw stream is encapsulated. ret = asf_streaming_start( stream ); + if( ret<0 ) { + printf("asf_streaming_start failed\n"); + } break; case DEMUXER_TYPE_AVI: case DEMUXER_TYPE_MOV: case DEMUXER_TYPE_MPEG_ES: case DEMUXER_TYPE_MPEG_PS: + case DEMUXER_TYPE_UNKNOWN: // Generic start, doesn't need to filter // the network stream, it's a raw stream ret = nop_streaming_start( stream ); + if( ret<0 ) { + printf("asf_streaming_start failed\n"); + } break; - case DEMUXER_TYPE_UNKNOWN: default: printf("Unable to detect the streaming type\n"); ret = -1; @@ -467,10 +472,7 @@ streaming_start(stream_t *stream, URL_t *url, int demuxer_type) { if( ret<0 ) { free( stream->streaming_ctrl ); - } else { -// bufferize( stream ); - } - + } return ret; }