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

Add support for another AVI with ogg/vorbis audio (0x674F) 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5898 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2002-04-29 13:36:18 +00:00
parent 21369b2318
commit 1f37707336
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libmpdemux/demuxer.c
View File

@ -800,8 +800,22 @@ switch(file_format){
demuxer = (demuxer_t*) demux_open_avi(demuxer);
if(!demuxer) return NULL; // failed to open
sh_a = (sh_audio_t*)demuxer->audio->sh;
if(demuxer->audio->id != -2 && sh_a && sh_a->format == 0xFFFE)
demuxer = init_avi_with_ogg(demuxer);
if(demuxer->audio->id != -2 && sh_a) {
if(sh_a->format == 0xFFFE)
demuxer = init_avi_with_ogg(demuxer);
else if(sh_a->format == 0x674F) {
stream_t* s;
demuxer_t *od;
s = new_ds_stream(demuxer->audio);
od = new_demuxer(s,DEMUXER_TYPE_OGG,-1,-2,-2);
if(!demux_ogg_open(od)) {
mp_msg( MSGT_DEMUXER,MSGL_ERR,"Unable to open the ogg demuxer\n");
free_stream(s);
demuxer->audio->id = -2;
} else
demuxer = new_demuxers_demuxer(demuxer,od,demuxer);
}
}
return demuxer;
// break;
}