[FFmpeg-cvslog] fixed issue1962 EVO detection

Michael Niedermayer git at videolan.org
Sun Apr 3 18:20:08 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar  9 01:07:35 2011 +0100| [2f9815dd26bf9d63720fb3e0b38900180c35f3b3] | committer: Michael Niedermayer

fixed issue1962 EVO detection

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

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

 libavformat/mpeg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index e4f774d..47be6d2 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -71,6 +71,7 @@ static int mpegps_probe(AVProbeData *p)
             // and audio streams
             else if((code & 0xe0) == AUDIO_ID &&  pes) {audio++; i+=len;}
             else if(code == PRIVATE_STREAM_1  &&  pes) {priv1++; i+=len;}
+            else if(code == 0x1fd             &&  pes) vid++; //VC1
 
             else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
             else if((code & 0xe0) == AUDIO_ID && !pes) invalid++;
@@ -78,7 +79,7 @@ static int mpegps_probe(AVProbeData *p)
         }
     }
 
-    if(vid+audio > invalid)     /* invalid VDR files nd short PES streams */
+    if(vid+audio > invalid+1)     /* invalid VDR files nd short PES streams */
         score= AVPROBE_SCORE_MAX/4;
 
 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, invalid, p->buf_size);



More information about the ffmpeg-cvslog mailing list