[FFmpeg-cvslog] mpegvideo_probe: count video and audio pes seperately

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov  8 20:29:06 2011 +0100| [b52f2d88fe3ec1225ddc76649e3fc1d1971e4f81] | committer: Michael Niedermayer

mpegvideo_probe: count video and audio pes seperately

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b52f2d88fe3ec1225ddc76649e3fc1d1971e4f81
---

 libavformat/mpegvideodec.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index 1e8aa4e..d146b1a 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -34,7 +34,7 @@
 static int mpegvideo_probe(AVProbeData *p)
 {
     uint32_t code= -1;
-    int pic=0, seq=0, slice=0, pspack=0, pes=0;
+    int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0;
     int i;
 
     for(i=0; i<p->buf_size; i++){
@@ -46,11 +46,11 @@ static int mpegvideo_probe(AVProbeData *p)
             case   SLICE_START_CODE...0x1af: slice++; break;
             case    PACK_START_CODE: pspack++; break;
             }
-            if     ((code & 0x1f0) == VIDEO_ID)   pes++;
-            else if((code & 0x1e0) == AUDIO_ID)   pes++;
+            if     ((code & 0x1f0) == VIDEO_ID)   vpes++;
+            else if((code & 0x1e0) == AUDIO_ID)   apes++;
         }
     }
-    if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !pes)
+    if(seq && seq*9<=pic*10 && pic*9<=slice*10 && !pspack && !apes && !vpes)
         return pic>1 ? AVPROBE_SCORE_MAX/2+1 : AVPROBE_SCORE_MAX/4; // +1 for .mpg
     return 0;
 }