aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-09 01:07:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-04-03 16:40:12 +0200
commit2f9815dd26bf9d63720fb3e0b38900180c35f3b3 (patch)
tree7d435dae7770b51c10c7f94dee0969eb79c688ad
parent512f973eac9a8c38ca33f089b6f3bb433ffc6a2e (diff)
downloadffmpeg-2f9815dd26bf9d63720fb3e0b38900180c35f3b3.tar.gz
fixed issue1962 EVO detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index e4f774db3c..47be6d2bbe 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);