diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-03-01 20:09:44 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-03-01 20:09:44 +0000 |
| commit | e01dc227f391937c4e73a0f494a4e0130dcd25c4 (patch) | |
| tree | 600d53587ce19a61bc825ec3a62ca60b946eaea9 | |
| parent | 8945ebb9c1fa4ae0f734676adcb7d519d4e6664b (diff) | |
| download | ffmpeg-streaming-e01dc227f391937c4e73a0f494a4e0130dcd25c4.zip ffmpeg-streaming-e01dc227f391937c4e73a0f494a4e0130dcd25c4.tar.gz | |
can't have PES headers in MPEG video elementary streams so fail probe
if we see one
Originally committed as revision 5089 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/raw.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/raw.c b/libavformat/raw.c index 89846d1..5a007ca 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -305,11 +305,13 @@ static int video_read_header(AVFormatContext *s, #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 @@ static int mpegvideo_probe(AVProbeData *p) 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; } |
