Mercurial > libavformat.hg
changeset 5422:3e5fefc4b475 libavformat
Flip the comparission direction of vid+audio+priv1 and pspack, it appears to have
been wrong.
Fixes issue1571.
author | michael |
---|---|
date | Tue, 08 Dec 2009 12:19:30 +0000 |
parents | 26a5d390beb0 |
children | beac179b6765 |
files | mpeg.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mpeg.c Mon Dec 07 13:55:38 2009 +0000 +++ b/mpeg.c Tue Dec 08 12:19:30 2009 +0000 @@ -79,7 +79,7 @@ //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size); if(sys>invalid && sys*9 <= pspack*10) return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg - if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10) + if(pspack > invalid && (priv1+vid+audio)*10 >= pspack*9) return pspack > 2 ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048 && vid + audio > invalid) /* PES stream */ return (audio > 12 || vid > 3) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4;