From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 01E8D4035A for ; Sat, 19 Nov 2022 21:35:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD14A68B26F; Sat, 19 Nov 2022 23:35:28 +0200 (EET) Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87C06689C24 for ; Sat, 19 Nov 2022 23:35:21 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id 8so5825637qka.1 for ; Sat, 19 Nov 2022 13:35:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a+IdOFYVx4wJ6ERtYB9G3N4/MISo/2Vqu05fWTPB23U=; b=YdiBJrlGsHg49O8sZDN0xul9d91jLp2yZm175XGSdKL0lxW0PM6D05+P1JGQYWmxKA VBLmGWmt91pJ/k2HZkjK1UjaidyTxMX/FJ/9JC8eE5baus2KIu7CMkVYKsNvUznxLGTe v6EwalON+ELc/dDimyQae9ACz7JfBTL15wdMeeg+KExewMHt1mbIoUGvtJZhhckQbRht 5PVVwCO2iJMgWnEBsMi/0XWB1EeyVMSkvsHpxwtsDDmSjzgtkdYQYFNSZXKOip7ryq+t uBaJ13QzgApFrPQHmVM5gLiRlzMZ5ScgLO2mKOLRjnpYngT1UAzrnpJzBOpQQ5NCHy8I OSHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a+IdOFYVx4wJ6ERtYB9G3N4/MISo/2Vqu05fWTPB23U=; b=eyU382N9RRVgkm0hEu0uoKrJ3qHIngqjgCMnjJM8cgfgvtp7FSH3lKcTl9/qwzzjx+ FWN6YGlCWqozQ1HLAyfJUS4Ie0aDXnIShTOm6fnzFmhWdi+FVafHC3fh+ref3hdrS7/u SQFpr1G6SarzmElOqz8z6bXcsR7JW4oU1R/U3wG9D+qrp3vxPS+HnxYjnBKL0Hb2umn+ A9/iKwyISuGCt4Mh90rww0y+Sq/8Uav4OaaKtuPT3q+QtbgMu2ZvIbtQmrPt4KmZZ8/F L2ppvRVQZ8dmS8UBRmF2fvVDIFer3uBfAMnGJWIyVJJCqU2U22aYRxWWxHC4ew9bQLG5 Quiw== X-Gm-Message-State: ANoB5pk13wQwhz23QvPhQVe0EvxX/nxLnRs4csiUyiboqMxrsOrn5IUa Ngtp06TBGiY1y27vzX7pSoF2D8WhzjA= X-Google-Smtp-Source: AA0mqf5ghxTeS4mP0hPQhGDz7o1XTaKcO/3VHhthy1kWPZRPpzp4dMdecg4bH0kUBkgUzmyhww7sqQ== X-Received: by 2002:ae9:f10c:0:b0:6ec:5496:4e17 with SMTP id k12-20020ae9f10c000000b006ec54964e17mr10908724qkg.559.1668893719781; Sat, 19 Nov 2022 13:35:19 -0800 (PST) Received: from localhost.localdomain ([50.201.95.250]) by smtp.gmail.com with ESMTPSA id w128-20020a379486000000b006cf19068261sm4954756qkd.116.2022.11.19.13.35.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Nov 2022 13:35:19 -0800 (PST) From: Rick Kern To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Nov 2022 16:35:15 -0500 Message-Id: <20221119213516.45148-2-kernrj@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221119213516.45148-1-kernrj@gmail.com> References: <20221119213516.45148-1-kernrj@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fftools/objpool: move objpool to libavutil 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Moved objpool to libavutil to make it available outside of fftools. Signed-off-by: Rick Kern --- fftools/Makefile | 1 - fftools/ffmpeg_mux.c | 2 +- fftools/sync_queue.c | 2 +- fftools/thread_queue.c | 2 +- fftools/thread_queue.h | 2 +- libavutil/Makefile | 2 ++ {fftools => libavutil}/objpool.c | 0 {fftools => libavutil}/objpool.h | 0 8 files changed, 6 insertions(+), 5 deletions(-) rename {fftools => libavutil}/objpool.c (100%) rename {fftools => libavutil}/objpool.h (100%) diff --git a/fftools/Makefile b/fftools/Makefile index 8ac38e75d2..25b11deaff 100644 --- a/fftools/Makefile +++ b/fftools/Makefile @@ -16,7 +16,6 @@ OBJS-ffmpeg += \ fftools/ffmpeg_mux.o \ fftools/ffmpeg_mux_init.o \ fftools/ffmpeg_opt.o \ - fftools/objpool.o \ fftools/sync_queue.o \ fftools/thread_queue.o \ diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index ad04f5049d..bd1a1ed403 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -22,7 +22,6 @@ #include "ffmpeg.h" #include "ffmpeg_mux.h" -#include "objpool.h" #include "sync_queue.h" #include "thread_queue.h" @@ -30,6 +29,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/mem.h" +#include "libavutil/objpool.h" #include "libavutil/timestamp.h" #include "libavutil/thread.h" diff --git a/fftools/sync_queue.c b/fftools/sync_queue.c index c2b23ee4f5..75b8dc72fc 100644 --- a/fftools/sync_queue.c +++ b/fftools/sync_queue.c @@ -24,8 +24,8 @@ #include "libavutil/fifo.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" +#include "libavutil/objpool.h" -#include "objpool.h" #include "sync_queue.h" typedef struct SyncQueueStream { diff --git a/fftools/thread_queue.c b/fftools/thread_queue.c index a1ab4ce92e..ced7b02fba 100644 --- a/fftools/thread_queue.c +++ b/fftools/thread_queue.c @@ -24,9 +24,9 @@ #include "libavutil/fifo.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" +#include "libavutil/objpool.h" #include "libavutil/thread.h" -#include "objpool.h" #include "thread_queue.h" enum { diff --git a/fftools/thread_queue.h b/fftools/thread_queue.h index 0cc8c71ebd..6d5862bd1f 100644 --- a/fftools/thread_queue.h +++ b/fftools/thread_queue.h @@ -21,7 +21,7 @@ #include -#include "objpool.h" +#include "libavutil/objpool.h" typedef struct ThreadQueue ThreadQueue; diff --git a/libavutil/Makefile b/libavutil/Makefile index 3d9c07aea8..bd9ac28335 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -62,6 +62,7 @@ HEADERS = adler32.h \ mem.h \ motion_vector.h \ murmur3.h \ + objpool.h \ opt.h \ parseutils.h \ pixdesc.h \ @@ -149,6 +150,7 @@ OBJS = adler32.o \ md5.o \ mem.o \ murmur3.o \ + objpool.o \ opt.o \ parseutils.o \ pixdesc.o \ diff --git a/fftools/objpool.c b/libavutil/objpool.c similarity index 100% rename from fftools/objpool.c rename to libavutil/objpool.c diff --git a/fftools/objpool.h b/libavutil/objpool.h similarity index 100% rename from fftools/objpool.h rename to libavutil/objpool.h -- 2.38.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".