[MPlayer-cvslog] r37350 - trunk/libmpdemux/demux_avi.c

[reimar]

Author: reimar
Date: Tue Dec 30 16:34:39 2014
New Revision: 37350

Log:
demux_avi: Minor simplification.

Modified:
   trunk/libmpdemux/demux_avi.c

Modified: trunk/libmpdemux/demux_avi.c
==============================================================================
--- trunk/libmpdemux/demux_avi.c	Tue Dec 30 11:17:45 2014	(r37349)
+++ trunk/libmpdemux/demux_avi.c	Tue Dec 30 16:34:39 2014	(r37350)
@@ -858,13 +858,13 @@ static int avi_check_file(demuxer_t *dem
   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)
-      return DEMUXER_TYPE_AVI;
-    // "Samsung Digimax i6 PMP" crap according to bug 742
-    if(id==mmioFOURCC('A','V','I',0x19))
-      return DEMUXER_TYPE_AVI;
-    if(id==mmioFOURCC('O','N','2','f')){
+    switch (id)
+    {
+    case mmioFOURCC('O','N','2','f'):
       mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_ON2AviFormat);
+      /* Fallthrough */
+    case formtypeAVI:
+    case mmioFOURCC('A','V','I',0x19): // "Samsung Digimax i6 PMP" crap according to bug 742
       return DEMUXER_TYPE_AVI;
     }
   }