Message ID | 20200615000204.10568-7-andreas.rheinhardt@gmail.com |
---|---|
State | Accepted |
Commit | dc4af87d2faf30a64be802691b7d16f3707a8f40 |
Headers | show
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> 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 7CA22448DD8 for <patchwork@ffaux-bg.ffmpeg.org>; Mon, 15 Jun 2020 03:02:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 65F2E68B711; Mon, 15 Jun 2020 03:02:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D7C468B68D for <ffmpeg-devel@ffmpeg.org>; Mon, 15 Jun 2020 03:02:44 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id t18so15266104wru.6 for <ffmpeg-devel@ffmpeg.org>; Sun, 14 Jun 2020 17:02:44 -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=XECO06i/Py/ocxy9O/LII+cgrSSfR6vc80so/7TuZlo=; b=NJicPN2UuxDO5nxqFGvewc708cXOfY+uW73hhNZIW4JnDdU4/fdRA5NIkyh8S+rIUl UFdvabngupxWm28TTLtOEM41+NJCYrXLoyJqSy8l8Fhb4j47ZYgl2pS2EnW7VeYri2GQ ClqKnQJrowFMGo/cgGoV6UGVninwZUoyaNRPpjfi2AIDHYjoBSNSG6eMSex9eNFUN7K+ LXZKEIBR8fJ8IvPmpJxT8a7M5PihizfGEMQrkQroXBXz/hfbRaKe36CBYkQxMt/NZEv0 daCJ7M32IEKA1rlgFGJ+YVOAck68sDsD+5fq6+q6wVryzS5iaMljJuPEkExp5+RvP63C cYoA== 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=XECO06i/Py/ocxy9O/LII+cgrSSfR6vc80so/7TuZlo=; b=JWZo2coeYUilAuKkozYNwQNcUNlyH3xk0cvH872nUAR3yllp8N/gdZWL0UvMzj/cp/ mhZFDMn6lNirT5HqVVHQsR5wFBzYajHQk4WVbwXDtAELkbxxo+DP/INEmtDwDModzpT9 23U2q5umegw8QzWtIatRlJ9KeGS5eB8MFxLCHYgleWTdU50ffKUWT2dx4pPAlN5zPIIR EFMO7vnrB5pfE2hfHpqVE0dmOT+3b+Kbw68C899lTRYvAr5yMVLFwLSFcSij7i2PWtma 4r2oy/zchFf5N5JGEbv/WyMdFJG5ayuf/qcKS2vWQOXZ3UuOrgwhPjsWX7Wy9ssveJFX ltMA== X-Gm-Message-State: AOAM531b7jfZ3CIzYC5QGmjxlSo+LxO94TVIggfQQQmbvnCXmcNX3G8O zlHSBVSG5lbdCx2Fnb0NcqRsDwsO X-Google-Smtp-Source: ABdhPJwXSWIFFnyW3q071P9xcr/gWcAr+bo46+2LC2qVmpJRVjLRHDuaN4l5e7DopfKruFsrlX94JA== X-Received: by 2002:a5d:4484:: with SMTP id j4mr25433447wrq.325.1592179363183; Sun, 14 Jun 2020 17:02:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:02:42 -0700 (PDT) From: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 02:02:02 +0200 Message-Id: <20200615000204.10568-7-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 33/35] avformat/mpl2dec: 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
Series |
[FFmpeg-devel,01/26] avformat/matroskadec: Move AVBufferRef instead of copying, fix memleak
|
expand
|
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index bea258d9e9..38445c7aad 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -83,7 +83,6 @@ static int mpl2_read_header(AVFormatContext *s) { MPL2Context *mpl2 = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); - int res = 0; if (!st) return AVERROR(ENOMEM); @@ -122,7 +121,7 @@ static int mpl2_read_header(AVFormatContext *s) } ff_subtitles_queue_finalize(s, &mpl2->q); - return res; + return 0; } static int mpl2_read_packet(AVFormatContext *s, AVPacket *pkt)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/mpl2dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)