From patchwork Wed Mar 1 08:40:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2709 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp1832884vsf; Wed, 1 Mar 2017 00:40:18 -0800 (PST) X-Received: by 10.223.177.207 with SMTP id r15mr6731195wra.127.1488357618079; Wed, 01 Mar 2017 00:40:18 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l136si6081641wmg.141.2017.03.01.00.40.17; Wed, 01 Mar 2017 00:40:18 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 633EC688399; Wed, 1 Mar 2017 10:40:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E064688324 for ; Wed, 1 Mar 2017 10:39:59 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1ciznt-0005iU-LD for ffmpeg-devel@ffmpeg.org; Wed, 01 Mar 2017 09:40:09 +0100 Received: from [192.168.1.3] ([80.110.115.245]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id qYg81u0295Hkk6g01Yg9Tp; Wed, 01 Mar 2017 09:40:09 +0100 X-SourceIP: 80.110.115.245 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Wed, 1 Mar 2017 09:40:08 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201703010940.08541.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/cavsvideodec: Return a lower score if only one frame was found X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #6208. Please comment, Carl Eugen From 901443bd61d33f62a4fd904aad5f270d0a018a8a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Mar 2017 09:35:16 +0100 Subject: [PATCH 2/2] lavf/cavsvideodec: Return a lower score if only one frame was found. Fixes ticket #6208. --- libavformat/cavsvideodec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index b4da58e..fa920ad 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -61,8 +61,11 @@ static int cavsvideo_probe(AVProbeData *p) } } } - if(seq && seq*9<=pic*10) + if (seq && seq * 9 <= pic * 10 && pic > 1) { return AVPROBE_SCORE_EXTENSION+1; + } else if (seq && seq * 9 <= pic * 10) { + return AVPROBE_SCORE_EXTENSION - 1; + } return 0; }