[Ffmpeg-cvslog] CVS: ffmpeg/libavformat raw.c,1.67,1.68

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv9863

Modified Files:
	raw.c 
Log Message:
can't have PES headers in MPEG video elementary streams so fail probe
if we see one


Index: raw.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/raw.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- raw.c	10 Feb 2006 01:24:32 -0000	1.67
+++ raw.c	1 Mar 2006 20:09:44 -0000	1.68
@@ -305,11 +305,13 @@
 #define PICTURE_START_CODE      0x00000100
 #define SLICE_START_CODE        0x00000101
 #define PACK_START_CODE         0x000001ba
+#define VIDEO_ID                0x000001e0
+#define AUDIO_ID                0x000001c0
 
 static int mpegvideo_probe(AVProbeData *p)
 {
     uint32_t code= -1;
-    int pic=0, seq=0, slice=0, pspack=0;
+    int pic=0, seq=0, slice=0, pspack=0, pes=0;
     int i;
 
     for(i=0; i<p->buf_size; i++){
@@ -320,10 +322,12 @@
             case PICTURE_START_CODE:   pic++; break;
             case   SLICE_START_CODE: slice++; break;
             case    PACK_START_CODE: pspack++; break;
+            case           VIDEO_ID:
+            case           AUDIO_ID:   pes++; break;
             }
         }
     }
-    if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack)
+    if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes)
         return AVPROBE_SCORE_MAX/2+1; // +1 for .mpg
     return 0;
 }