Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 13588:d1ff5291daed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support ON2 variation of AVI format (.vp5 files) Also closes bug #104
author rtognimp
date Fri, 08 Oct 2004 21:28:19 +0000
parents 5f4f9de738b2
children 2299f20215a4
comparison
equal deleted inserted replaced
13587:3fd5fc67f386 13588:d1ff5291daed
695 //=============== Try to open as AVI file: ================= 695 //=============== Try to open as AVI file: =================
696 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ 696 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){
697 demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id); 697 demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id);
698 { //---- RIFF header: 698 { //---- RIFF header:
699 int id=stream_read_dword_le(demuxer->stream); // "RIFF" 699 int id=stream_read_dword_le(demuxer->stream); // "RIFF"
700 if(id==mmioFOURCC('R','I','F','F')){ 700 if((id==mmioFOURCC('R','I','F','F')) || (id==mmioFOURCC('O','N','2',' '))){
701 stream_read_dword_le(demuxer->stream); //filesize 701 stream_read_dword_le(demuxer->stream); //filesize
702 id=stream_read_dword_le(demuxer->stream); // "AVI " 702 id=stream_read_dword_le(demuxer->stream); // "AVI "
703 if(id==formtypeAVI){ 703 if(id==formtypeAVI){
704 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI"); 704 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI");
705 file_format=DEMUXER_TYPE_AVI;
706 }
707 if(id==mmioFOURCC('O','N','2','f')){
708 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ON2 AVI");
705 file_format=DEMUXER_TYPE_AVI; 709 file_format=DEMUXER_TYPE_AVI;
706 } 710 }
707 } 711 }
708 if (file_format==DEMUXER_TYPE_UNKNOWN) { 712 if (file_format==DEMUXER_TYPE_UNKNOWN) {
709 free_demuxer(demuxer); 713 free_demuxer(demuxer);