From patchwork Mon Jun 15 00:02:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20382 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 91912448DD8 for ; Mon, 15 Jun 2020 03:02:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8308A68B6F3; Mon, 15 Jun 2020 03:02:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C275F68B6C2 for ; Mon, 15 Jun 2020 03:02:46 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id l10so15236675wrr.10 for ; Sun, 14 Jun 2020 17:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VEpIC8dJ7xy5zia9YS3Dxx8MIzXozq/p37FeK1nNY8k=; b=HYkHxNJeX87Hi8WTMbfviKthoAIR2vYC0/bdD2RVyVks5O2m+qmgd/IzLDCoisHQDi J6U56sNDCr2E+xts+vfBj2ZAGIdb8tjEJi1qMD1k3o/20ATL0nQf0uf3BifI7/XMreic zefHflbuu53PYqGMp/uaUDQTLpEeUs/A81/SY+panhQdx0mYVOH0Xt72i8I9uhl50aFY zfONBSX6K8YtApShCFNYCGwTxcKeRLX6nIA2/mDDzes9/Pzjt4NmgRm7EDtAG0tV/pTB HhrKko4vf5cKwrCuRTOr9uPLfWXhsiDlGIqSqNptz9ZgusS9/6OGoF/OJMAnN0fCGkp0 HHqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VEpIC8dJ7xy5zia9YS3Dxx8MIzXozq/p37FeK1nNY8k=; b=bnKgU1zJwS2/I3J1vBE7s6U3G+rMrj1ue9GjN9w/YILx/n1uzj+N7bZV0ASwOoDRnb KDhch6RroZAqODUW1Zu/jzotNFFR+1luw7fDFmoC6HmP4NDKZvb524WytQiE6fr6u+fZ uVFDSqyxZiLpe4VRaaGCTPl8kvV331zngEDSkA0N0iZSU9/mcE+Lvj1rpj5oQNSvoAm5 eV5k6TRI4B2mNPRC9a8ldHsypfVqz8IV5rHuJ/Hf2pCJ4z9EG/rp7Dk55nqWpuscZ8aA Z3dxrI0lklmmNIZVxRbCuRixiumROWftt151PlPPECEiRqlwDNIdau3qsLCeXcqGqTav 0ZUQ== X-Gm-Message-State: AOAM5317VCH3EQfmg5pnidHHZGv0KNYIUBvYS5GcLkA1iUO3QpzcSOJX d1k+Cl29o97Nm3a/jhGZe+635xv1 X-Google-Smtp-Source: ABdhPJzkc7CMTHLNFHfyGzI912IQTIeR1KRVB53SeyfwJ5lcDKRVmLSD4miQJu/d8HZ/dGIcOyKZng== X-Received: by 2002:adf:de84:: with SMTP id w4mr26492324wrl.54.1592179365988; Sun, 14 Jun 2020 17:02:45 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id 5sm29512167wrr.5.2020.06.14.17.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:02:45 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 02:02:04 +0200 Message-Id: <20200615000204.10568-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> References: <20200614223656.21338-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 35/35] avformat/sccdec: Avoid variable that is always zero 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/sccdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index 72f47f70de..c08c58ef97 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -66,7 +66,7 @@ static int scc_read_header(AVFormatContext *s) char line[4096], line2[4096]; int64_t current_pos, next_pos; int64_t ts_start, ts_end; - int count = 0, ret = 0; + int count = 0; ptrdiff_t len2, len; uint8_t out[4096]; FFTextReader tr; @@ -177,7 +177,7 @@ try_again: ff_subtitles_queue_finalize(s, &scc->q); - return ret; + return 0; fail: ff_subtitles_queue_clean(&scc->q); return AVERROR(ENOMEM);