From patchwork Wed Dec 30 06:26:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 24684 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 C596044BD1E for ; Wed, 30 Dec 2020 08:28:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E0156882F0; Wed, 30 Dec 2020 08:28:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 327CC6882F0 for ; Wed, 30 Dec 2020 08:27:54 +0200 (EET) IronPort-SDR: EoppEXElJHE8oUdNn70KqM3cSFCNjBsc6v1cNypox2z9JdfhahgGSqbHH6GytMUpGPsrgYRh0c jOyO5W40oNsA== X-IronPort-AV: E=McAfee;i="6000,8403,9849"; a="176672903" X-IronPort-AV: E=Sophos;i="5.78,460,1599548400"; d="scan'208";a="176672903" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Dec 2020 22:27:52 -0800 IronPort-SDR: 4GCwiZk3DPqvgswD5+S1kQ4+yftEXvV9nG26cV4cn9XwYB6hR9HDaeBRMKkCEnWh2wDRAr314o O+YGR9hStfSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,460,1599548400"; d="scan'208";a="460372226" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by fmsmga001.fm.intel.com with ESMTP; 29 Dec 2020 22:27:51 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Dec 2020 14:26:37 +0800 Message-Id: <20201230062637.29513-1-yejun.guo@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] dnn/queue: fix redefining typedefs 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Guo, Yejun --- libavfilter/dnn/queue.c | 8 ++++---- libavfilter/dnn/safe_queue.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/dnn/queue.c b/libavfilter/dnn/queue.c index 0a07c5473d..da0517968d 100644 --- a/libavfilter/dnn/queue.c +++ b/libavfilter/dnn/queue.c @@ -25,17 +25,17 @@ typedef struct _queue_entry queue_entry; -typedef struct _queue { +struct _queue { queue_entry *head; queue_entry *tail; size_t length; -}queue; +}; -typedef struct _queue_entry { +struct _queue_entry { void *value; queue_entry *prev; queue_entry *next; -} queue_entry; +}; static inline queue_entry *create_entry(void *val) { diff --git a/libavfilter/dnn/safe_queue.c b/libavfilter/dnn/safe_queue.c index dba2e0fbbc..4298048454 100644 --- a/libavfilter/dnn/safe_queue.c +++ b/libavfilter/dnn/safe_queue.c @@ -25,11 +25,11 @@ #include "libavutil/avassert.h" #include "libavutil/thread.h" -typedef struct _safe_queue { +struct _safe_queue { queue *q; pthread_mutex_t mutex; pthread_cond_t cond; -}safe_queue; +}; safe_queue *safe_queue_create(void) {