ffmpeg | branch: release/1.2 | Michael Niedermayer <[email protected]> | Sun Sep 7 19:18:21 2014 +0200| [e5cf4d16c60e438ba027947645a1d0a732b49257] | committer: Carl Eugen Hoyos
avformat/mpeg: increase score for short mpeg-ps by 1 Fixes Ticket 3855 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 5109ce2017c15202275b33bce58ec9d88044eeb5) Conflicts: libavformat/mpeg.c > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5cf4d16c60e438ba027947645a1d0a732b49257 --- libavformat/mpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 82957a1..a49fdbe 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -91,7 +91,7 @@ static int mpegps_probe(AVProbeData *p) score= AVPROBE_SCORE_MAX/4; if(sys>invalid && sys*9 <= pspack*10) - return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4; // +1 for .mpg + return (audio > 12 || vid > 3 || pspack > 2) ? AVPROBE_SCORE_MAX/2+2 : AVPROBE_SCORE_MAX/4+1; // +1 for .mpg 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 */ _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
