[Ffmpeg-cvslog] r5540 - trunk/libavformat/mpeg.c

[mru]

Author: mru
Date: Wed Jun 28 23:40:08 2006
New Revision: 5540

Modified:
   trunk/libavformat/mpeg.c

Log:
detect MPEG PES streams as MPEG PS; the PS demuxer will cope


Modified: trunk/libavformat/mpeg.c
==============================================================================
--- trunk/libavformat/mpeg.c	(original)
+++ trunk/libavformat/mpeg.c	Wed Jun 28 23:40:08 2006
@@ -1263,7 +1263,7 @@
 static int mpegps_probe(AVProbeData *p)
 {
     uint32_t code= -1;
-    int sys=0, pspack=0, priv1=0, vid=0;
+    int sys=0, pspack=0, priv1=0, vid=0, audio=0;
     int i;
 
     for(i=0; i<p->buf_size; i++){
@@ -1274,6 +1274,7 @@
             case         PRIVATE_STREAM_1:  priv1++; break;
             case          PACK_START_CODE: pspack++; break;
             case       (VIDEO_ID + 0x100):    vid++; break;
+            case       (AUDIO_ID + 0x100):  audio++; break;
             }
         }
     }
@@ -1281,6 +1282,8 @@
         return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
     if((priv1 || vid) && (priv1+vid)*9 <= pspack*10)
         return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
+    if((!!vid ^ !!audio) && !sys && !pspack) /* PES stream */
+        return AVPROBE_SCORE_MAX/2;
     return 0;
 }