[MPlayer-cvslog] r21945 - trunk/libmpdemux/demux_mpg.c

[nicodvb]

Author: nicodvb
Date: Tue Jan 16 23:50:47 2007
New Revision: 21945

Modified:
   trunk/libmpdemux/demux_mpg.c

Log:
in evo files [e]ac3 substreams range from 0xc0 to 0xcf

Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c	(original)
+++ trunk/libmpdemux/demux_mpg.c	Tue Jan 16 23:50:47 2007
@@ -180,7 +180,8 @@
       case 0x80: if((aid & 0xF8) == 0x88) sh_a->format=0x2001;//dts
                   else sh_a->format=0x2000;break; // ac3
     }
-    if(aid == 0xC0) sh_a->format=0x2000;
+    //evo files
+    if(aid & 0xC0 == 0xC0) sh_a->format=0x2000;
     if (mpg_d) mpg_d->a_stream_ids[mpg_d->num_a_streams++] = aid;
   }
   if(demux->audio->id==-1) demux->audio->id=aid;
@@ -313,7 +314,7 @@
             ds=demux->sub;
         }
           
-      } else if((aid & 0xC0) == 0x80 || (aid & 0xE0) == 0x00 || aid==0xC0) {
+      } else if((aid & 0xC0) == 0x80 || (aid & 0xE0) == 0x00 || (aid & 0xC0) == 0xC0) {
 
 //        aid=128+(aid&0x7F);
         // aid=0x80..0xBF