diff options
| author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-15 03:40:37 +0000 |
|---|---|---|
| committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-15 03:40:37 +0000 |
| commit | 2ba092874905669f0f8e8fda1b043c73e50db716 (patch) | |
| tree | f6fb6813964153e16bad3a110c330a3f57ca7f5f /asfheader.c | |
| parent | 4eca33639f3d69767e15c92b35fc7387453ae126 (diff) | |
| download | mpv-2ba092874905669f0f8e8fda1b043c73e50db716.tar.bz2 mpv-2ba092874905669f0f8e8fda1b043c73e50db716.tar.xz | |
new stream selection code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@427 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'asfheader.c')
| -rw-r--r-- | asfheader.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asfheader.c b/asfheader.c index f9ef236129..e1c4ef1e83 100644 --- a/asfheader.c +++ b/asfheader.c @@ -128,7 +128,7 @@ if(verbose){ stream_read(demuxer->stream,(char*) buffer,streamh.type_size); switch(*((unsigned int*)&streamh.type)){ case 0xF8699E40: { // guid_audio_stream - sh_audio_t *sh_audio=&sh_audio_i; // FIXME! + sh_audio_t* sh_audio=new_sh_audio(streamh.stream_no & 0x7F); memcpy(&sh_audio->wf,buffer,streamh.type_size<64?streamh.type_size:64); if(verbose>=1) print_wave_header((WAVEFORMATEX*)buffer); if((*((unsigned int*)&streamh.concealment))==0xbfc3cd50){ @@ -141,17 +141,17 @@ if(verbose){ asf_scrambling_b=asf_scrambling_h=asf_scrambling_w=1; } printf("ASF: audio scrambling: %d x %d x %d\n",asf_scrambling_h,asf_scrambling_w,asf_scrambling_b); - if(demuxer->audio->id==-1) demuxer->audio->id=streamh.stream_no & 0x7F; + //if(demuxer->audio->id==-1) demuxer->audio->id=streamh.stream_no & 0x7F; break; } case 0xBC19EFC0: { // guid_video_stream - sh_video_t *sh_video=&sh_video_i; // FIXME! + sh_video_t* sh_video=new_sh_video(streamh.stream_no & 0x7F); memcpy(&sh_video->bih,&buffer[4+4+1+2],sizeof(BITMAPINFOHEADER)); - sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; - sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; + //sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; + //sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; if(verbose>=1) print_video_header((BITMAPINFOHEADER*)&buffer[4+4+1+2]); //asf_video_id=streamh.stream_no & 0x7F; - if(demuxer->video->id==-1) demuxer->video->id=streamh.stream_no & 0x7F; + //if(demuxer->video->id==-1) demuxer->video->id=streamh.stream_no & 0x7F; break; } } |