From patchwork Wed Aug 3 13:58:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37121 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp460367pzb; Wed, 3 Aug 2022 07:03:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Vi/wRDUgWTvkd5ZQoXxnLKDMAdQ84QDdgTWo2ud0AK4xcQeGpHhHwBxSPrdg+tFEx6hK1 X-Received: by 2002:a05:6402:138f:b0:43d:8ed5:c841 with SMTP id b15-20020a056402138f00b0043d8ed5c841mr16682742edv.27.1659535396959; Wed, 03 Aug 2022 07:03:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659535396; cv=none; d=google.com; s=arc-20160816; b=bNqbKPh7l6s7tvZd2JJeuFLqMLsL4LiUftdnxI1WPqCWN/E5PMWXM2/g936JxY+idr yMJwD4lJ4hJxjCh/xsBQ+z6gzvZ6AoGjB6aHxx8ippU/nfUabre4jzYxhtrRQBxHifjl sHFg7QD1bBD4N0MCjfO0HCGEE+UOxYEcM7ZuFM8A6JIPIZdI10dqCdKMRTyimkOH/KVE YRnj6BfAp/GoSDDnoe+CdRUAgTuG48bWwFJALPqEdGO+HimBiGsOIlvshCmPyZ83yna+ Cgfd1KsilxUv3tVAPq7MROZjeUT5EuEpfAceJ8DiU198iJHCPRZHSwvNYlPnO996U4Fk CWzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=lOjHC0sPasuBDPCWrnaoCpahPr2pUEjGLXkH1fdHJ/c=; b=E9FYiID7/uIO7EPx5AXP4OpNKqFE+RLh0X9NfslFKHZ2T7gLgAr+4LvG+qRs+bzc0A OtQgx9BVci/N1iIlGqxdRBAGSCcZjbuaekaXXivMtYKnDdQwRJV3n+KvFmjzXrWzaQeO 4gyKb7Wnui8MZGHM/juNdytwDDOJOOh0SprXH9FmXC7Q+zfC1w+XSQX0Taz9nc9E95ff KVgBJRA0iD8iOY6iafTVTz77hXX1Rn0pJMgoZ6M+nhW/OOSOL4zRksgl3H0cUttemL4/ 5Hxj2qQrpzxxGskqJrcgpx8eeh248vFhgIjFMNXWbMGO4ToP4mkmP1fCbCcA+NmEPJU/ KOQA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u21-20020a50c055000000b0043be90a5cd7si15321307edd.429.2022.08.03.07.03.11; Wed, 03 Aug 2022 07:03:16 -0700 (PDT) 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 4154568B9E8; Wed, 3 Aug 2022 16:59:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0B4768B895 for ; Wed, 3 Aug 2022 16:59:04 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3651024017E for ; Wed, 3 Aug 2022 15:59:04 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id of7arS5UpnZS for ; Wed, 3 Aug 2022 15:59:03 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 1476B2405F5 for ; Wed, 3 Aug 2022 15:58:55 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 281CC3A04DA; Wed, 3 Aug 2022 15:58:52 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2022 15:58:34 +0200 Message-Id: <20220803135844.16662-15-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220803135844.16662-1-anton@khirnov.net> References: <20220803135844.16662-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/25] fftools/ffmpeg: drop a write-only variable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: LYgZkmFfQnXP --- fftools/ffmpeg.c | 1 - fftools/ffmpeg.h | 1 - 2 files changed, 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7ba1f2a8cf..a377e776c7 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3696,7 +3696,6 @@ static void free_input_thread(int i) av_packet_free(&pkt); pthread_join(f->thread, NULL); - f->joined = 1; av_thread_message_queue_free(&f->in_thread_queue); } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 23b249780b..fc082bfbea 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -437,7 +437,6 @@ typedef struct InputFile { AVThreadMessageQueue *in_thread_queue; pthread_t thread; /* thread reading from this file */ int non_blocking; /* reading packets from the thread should not block */ - int joined; /* the thread has been joined */ int thread_queue_size; /* maximum number of queued packets */ } InputFile;