[FFmpeg-devel] [PATCH 17/18] avutil/internal: Move avpriv_set_systematic_pal2 decl to imgutils_internal.h

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/bmpenc.c           | 2 +-
 libavcodec/gif.c              | 1 +
 libavcodec/pcxenc.c           | 2 +-
 libavcodec/xwdenc.c           | 1 +
 libavfilter/framepool.c       | 1 +
 libavfilter/vf_scale.c        | 1 +
 libavformat/av1.c             | 1 +
 libavutil/imgutils.c          | 1 -
 libavutil/imgutils_internal.h | 4 ++++
 libavutil/internal.h          | 3 ---
 10 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
index 3e3ca324ea..48f25170ba 100644
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@ -22,8 +22,8 @@
 
 #include "config.h"
 
-#include "libavutil/imgutils.h"
 #include "libavutil/avassert.h"
+#include "libavutil/imgutils_internal.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "bmp.h"
diff --git a/libavcodec/gif.c b/libavcodec/gif.c
index 56042d36a7..c36fa66737 100644
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@ -30,6 +30,7 @@
  * @see http://www.w3.org/Graphics/GIF/spec-gif89a.txt
  */
 
+#include "libavutil/imgutils_internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c
index cf9b41b752..b763c7df47 100644
--- a/libavcodec/pcxenc.c
+++ b/libavcodec/pcxenc.c
@@ -26,9 +26,9 @@
  * @see http://bespin.org/~qz/pc-gpe/pcx.txt
  */
 
+#include "libavutil/imgutils_internal.h"
 #include "avcodec.h"
 #include "bytestream.h"
-#include "libavutil/imgutils.h"
 #include "codec_internal.h"
 #include "encode.h"
 
diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c
index 08554d8632..40bee20109 100644
--- a/libavcodec/xwdenc.c
+++ b/libavcodec/xwdenc.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/imgutils_internal.h"
 #include "libavutil/pixdesc.h"
 #include "avcodec.h"
 #include "bytestream.h"
diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c
index 841caa0460..e8621e07ac 100644
--- a/libavfilter/framepool.c
+++ b/libavfilter/framepool.c
@@ -24,6 +24,7 @@
 #include "libavutil/buffer.h"
 #include "libavutil/frame.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/imgutils_internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixfmt.h"
 
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 00fcb31b1c..fc0e3802db 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -33,6 +33,7 @@
 #include "scale_eval.h"
 #include "video.h"
 #include "libavutil/eval.h"
+#include "libavutil/imgutils_internal.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
diff --git a/libavformat/av1.c b/libavformat/av1.c
index cb86e66d09..35c23dd0b0 100644
--- a/libavformat/av1.c
+++ b/libavformat/av1.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/mem.h"
+#include "libavutil/pixfmt.h"
 #include "libavcodec/av1.h"
 #include "libavcodec/av1_parse.h"
 #include "libavcodec/defs.h"
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 16e3133c33..d246381563 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -25,7 +25,6 @@
 #include "common.h"
 #include "imgutils.h"
 #include "imgutils_internal.h"
-#include "internal.h"
 #include "intreadwrite.h"
 #include "log.h"
 #include "mathematics.h"
diff --git a/libavutil/imgutils_internal.h b/libavutil/imgutils_internal.h
index d515858413..3e47731a50 100644
--- a/libavutil/imgutils_internal.h
+++ b/libavutil/imgutils_internal.h
@@ -22,6 +22,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "pixfmt.h"
+
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
+
 int ff_image_copy_plane_uc_from_x86(uint8_t       *dst, ptrdiff_t dst_linesize,
                                     const uint8_t *src, ptrdiff_t src_linesize,
                                     ptrdiff_t bytewidth, int height);
diff --git a/libavutil/internal.h b/libavutil/internal.h
index fe0b9d7a24..ac1af367e9 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -42,7 +42,6 @@
 #include "attributes.h"
 #include "libm.h"
 #include "macros.h"
-#include "pixfmt.h"
 
 #ifndef attribute_align_arg
 #if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
@@ -152,8 +151,6 @@ void avpriv_request_sample(void *avc,
 #define SUINT32 uint32_t
 #endif
 
-int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
-
 static av_always_inline av_const int avpriv_mirror(int x, int w)
 {
     if (!w)
-- 
2.40.1