diff mbox series

[FFmpeg-devel,1/2] fftools/objpool: move objpool to libavutil

Message ID 20221119213516.45148-2-kernrj@gmail.com
State New
Headers show
Series lavc/videotoolbox: use objpool instead of allocating memory each frame | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 fail Make fate failed

Commit Message

Rick Kern Nov. 19, 2022, 9:35 p.m. UTC 
Moved objpool to libavutil to make it available outside of fftools.

Signed-off-by: Rick Kern <kernrj@gmail.com>
---
 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 mbox series

Patch

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 <string.h>
 
-#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