From patchwork Mon Jun 15 00:02:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20386 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 37A1D448DD8 for ; Mon, 15 Jun 2020 03:02:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 266EB68B71F; Mon, 15 Jun 2020 03:02:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78F5E68B67E for ; Mon, 15 Jun 2020 03:02:45 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id p5so15237652wrw.9 for ; Sun, 14 Jun 2020 17:02:45 -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=Lu8jIuOJFdcShMoXGXrksfcG+cLTqNlXi2c0awDjkN0=; b=huXRN4C8IEVIVyxhhPqThTTciLCHN4ReY+p9pV0y3w+ZZZA9Ep8k7v7nPYz0A5habJ L10X86vtLdt/DeeOcma1xFoE8HYVd3qScLX1ijZLjPQ6EfXetoLeYPHzFxAo9S4xs54b XvI52R/EhbTltOsB9uWBrRGafyeNn3NzL2G08wNV1tzFLhKWczhQMg7+cacgOzcjhpl5 aJdXitRuHmEuH9MA2hqzjpBEqOSrYEBdZcla7U/jt94MhJiPYk02TJBonvAiBwrb/frG lleHd24QsDM80lvPjK3zFr4OM+ah97QyaCeYSljHX8rbfwrfAEI11wyP1lRyZ7kHOIfS ph7g== 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=Lu8jIuOJFdcShMoXGXrksfcG+cLTqNlXi2c0awDjkN0=; b=sg+QlNwRfAcp76QoXsh3drIcSthf3AGamAepvPjebOphOrkpybt7ERzDTKPpzW2c4X vMJbjUkV2o75W4AE89o6DUwfVQFshzskTg3C79F3sJtysIqsvY4Q0d9osrWmW14iyKx2 JuFebSDp3iYxFOcAJzHfROj3Ual8trNaQ7B2H8IaKpruBmlgnES/OF2Ck9u7qUu8OvGu CYfIk6b8TLeK0Q9M7Mw+8IIr4ZFGavGjPsBQm6o/tCks9bs/BfK0M16scWqhBtWcZqZX Mts+fAVOFjc0ARAaVPhTTWoBh7kKzyb8Gw0SxKAODfCZ8TVHtS7bxvX74FFpcc8D3MX1 T6Lg== X-Gm-Message-State: AOAM531oS0nZA41AcxsIZFkc7CqOSzWBN2aXeAz+V+ND/GQVFVBV4dF1 +d4vlcfRMdeUKeGAXynt9LJpClBB X-Google-Smtp-Source: ABdhPJxdHrxwJ7sN5VTwHIjVHehRi7yXZZPYXXqCQMu/2SBU/ZQjLboqB25Ujk/abrW+Yot++4hsvg== X-Received: by 2002:adf:f003:: with SMTP id j3mr26206265wro.228.1592179364708; Sun, 14 Jun 2020 17:02:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 17:02:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 02:02:03 +0200 Message-Id: <20200615000204.10568-8-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 34/35] avformat/pjsdec: 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/pjsdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/pjsdec.c b/libavformat/pjsdec.c index e30c23d830..1f1d51c404 100644 --- a/libavformat/pjsdec.c +++ b/libavformat/pjsdec.c @@ -67,7 +67,6 @@ static int pjs_read_header(AVFormatContext *s) { PJSContext *pjs = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); - int res = 0; if (!st) return AVERROR(ENOMEM); @@ -105,7 +104,7 @@ static int pjs_read_header(AVFormatContext *s) } ff_subtitles_queue_finalize(s, &pjs->q); - return res; + return 0; } static int pjs_read_packet(AVFormatContext *s, AVPacket *pkt)