# HG changeset patch # User arpi # Date 1012008101 0 # Node ID 266cb1a6851986aa37dd5fcafb47d4cc7735d648 # Parent d4acef803c945e212ab209311cb1c104fdd831c2 pre-check for audio/video streams (hope it fix wma steraming) diff -r d4acef803c94 -r 266cb1a68519 libmpdemux/asfheader.c --- a/libmpdemux/asfheader.c Sat Jan 26 00:53:29 2002 +0000 +++ b/libmpdemux/asfheader.c Sat Jan 26 01:21:41 2002 +0000 @@ -129,6 +129,8 @@ int read_asf_header(demuxer_t *demuxer){ static unsigned char buffer[1024]; + int audio_streams=0; + int video_streams=0; #if 1 //printf("ASF file! (subchunks: %d)\n",asfh.cno); @@ -162,6 +164,7 @@ switch(ASF_LOAD_GUID_PREFIX(streamh.type)){ case ASF_GUID_PREFIX_audio_stream: { sh_audio_t* sh_audio=new_sh_audio(demuxer,streamh.stream_no & 0x7F); + ++audio_streams; sh_audio->wf=calloc((streamh.type_sizewf,buffer,streamh.type_size); le2me_WAVEFORMATEX(sh_audio->wf); @@ -182,6 +185,7 @@ case ASF_GUID_PREFIX_video_stream: { sh_video_t* sh_video=new_sh_video(demuxer,streamh.stream_no & 0x7F); int len=streamh.type_size-(4+4+1+2); + ++video_streams; // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); sh_video->bih=calloc((lenbih,&buffer[4+4+1+2],len); @@ -307,6 +311,16 @@ if(!stream_seek(demuxer->stream,endpos)) break; } // while EOF +mp_msg(MSGT_HEADER,MSGL_V,"ASF: %d audio and %d video streams found\n",audio_streams,video_streams); +if(!audio_streams) demuxer->audio->id=-2; // nosound +if(!video_streams){ + if(!audio_streams){ + mp_msg(MSGT_HEADER,MSGL_ERR,"ASF: no audio or video headers found - broken file?\n"); + return 0; + } + demuxer->video->id=-2; // audio-only +} + #if 0 if(verbose){ printf("ASF duration: %d\n",(int)fileh.duration);