# HG changeset patch # User mru # Date 1141243784 0 # Node ID 7f8b1a1ac0203f840140dae915c8e55149d2e056 # Parent b644fe79f7a2807518db9c61aa5d64a1f4cf16b2 can't have PES headers in MPEG video elementary streams so fail probe if we see one diff -r b644fe79f7a2 -r 7f8b1a1ac020 raw.c --- a/raw.c Wed Mar 01 16:11:04 2006 +0000 +++ b/raw.c Wed Mar 01 20:09:44 2006 +0000 @@ -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; ibuf_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; }