RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Respect -playlist for asx streams 

Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rtognimp 2004-04-17 16:46:41 +00:00
parent 83744e1bca
commit e3daf3ca75
7 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TOOLS/netstream/netstream.c
View File

@ -41,6 +41,7 @@
#endif
#include <libmpdemux/stream.h>
#include <libmpdemux/demuxer.h>
#include <mp_msg.h>
#include <bswap.h>
@ -69,7 +70,7 @@ static int write_error(int fd,char* msg) {
}
static int net_stream_open(client_t* cl,char* url) {
int file_format;
int file_format=DEMUXER_TYPE_UNKNOWN;
mp_net_stream_opened_t ret;
if(cl->stream) {

3
asxparser.c
View File

@ -9,6 +9,7 @@
#include "playtree.h"
#include "playtreeparser.h"
#include "libmpdemux/stream.h"
#include "libmpdemux/demuxer.h"
#include "asxparser.h"
#include "mp_msg.h"
#include "m_config.h"
@ -506,7 +507,7 @@ asx_parse_entryref(ASX_Parser_t* parser,char* buffer,char** _attribs) {
char *href;
stream_t* stream;
play_tree_parser_t* ptp;
int f;
int f=DEMUXER_TYPE_UNKNOWN;
if(parser->deep > 0)
return NULL;

2
libmpdemux/demuxer.c
View File

@ -1377,7 +1377,7 @@ extern int hr_mp3_seek;
demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){
stream_t *as = NULL,*ss = NULL;
demuxer_t *vd,*ad = NULL,*sd = NULL;
int afmt = 0,sfmt = 0;
int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ;
if(audio_stream) {
as = open_stream(audio_stream,0,&afmt);

6
libmpdemux/network.c
View File

@ -1168,7 +1168,13 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) {
return -1;
}
stream->streaming_ctrl->url = check4proxies( url );
if (*demuxer_type != DEMUXER_TYPE_PLAYLIST){
ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type );
} else {
ret=0;
}
if( ret<0 ) {
return -1;
}

7
libmpdemux/open.c
View File

@ -115,7 +115,12 @@ stream_t* open_stream(char* filename,char** options, int* file_format){
stream_t* stream=NULL;
int f=-1;
off_t len;
*file_format = DEMUXER_TYPE_UNKNOWN;
// Check if playlist or unknown
if (*file_format != DEMUXER_TYPE_PLAYLIST){
*file_format=DEMUXER_TYPE_UNKNOWN;
}
if(!filename) {
mp_msg(MSGT_OPEN,MSGL_ERR,"NULL filename, report this bug\n");
return NULL;

2
mencoder.c
View File

@ -337,7 +337,7 @@ demux_stream_t *d_dvdsub=NULL;
sh_audio_t *sh_audio=NULL;
sh_video_t *sh_video=NULL;
int file_format=DEMUXER_TYPE_UNKNOWN;
int i;
int i=DEMUXER_TYPE_UNKNOWN;
void *vobsub_writer=NULL;
uint32_t ptimer_start;

5
playtreeparser.c
View File

@ -15,6 +15,7 @@
#include "playtree.h"
#include "playtreeparser.h"
#include "libmpdemux/stream.h"
#include "libmpdemux/demuxer.h"
#include "mp_msg.h"
@ -518,7 +519,7 @@ parse_smil(play_tree_parser_t* p) {
play_tree_t*
embedded_playlist_parse(char *line) {
int f;
int f=DEMUXER_TYPE_PLAYLIST;
stream_t* stream;
play_tree_parser_t* ptp;
play_tree_t* entry;
@ -646,7 +647,7 @@ play_tree_t*
parse_playlist_file(char* file) {
stream_t *stream;
play_tree_t* ret;
int f;
int f=DEMUXER_TYPE_PLAYLIST;
stream = open_stream(file,0,&f);