From e55f4b71533417ff85f3450c143f3c3e14c32783 Mon Sep 17 00:00:00 2001 From: rtognimp Date: Fri, 8 Oct 2004 21:28:19 +0000 Subject: Support ON2 variation of AVI format (.vp5 files) Also closes bug #104 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13589 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libmpdemux/demuxer.c') diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 4c403d176d..a8646793db 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -697,13 +697,17 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id); { //---- RIFF header: int id=stream_read_dword_le(demuxer->stream); // "RIFF" - if(id==mmioFOURCC('R','I','F','F')){ + if((id==mmioFOURCC('R','I','F','F')) || (id==mmioFOURCC('O','N','2',' '))){ stream_read_dword_le(demuxer->stream); //filesize id=stream_read_dword_le(demuxer->stream); // "AVI " if(id==formtypeAVI){ mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI"); file_format=DEMUXER_TYPE_AVI; } + if(id==mmioFOURCC('O','N','2','f')){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ON2 AVI"); + file_format=DEMUXER_TYPE_AVI; + } } if (file_format==DEMUXER_TYPE_UNKNOWN) { free_demuxer(demuxer); -- cgit v1.2.3