avutil/internal: Move avpriv_set_systematic_pal2 decl to imgutils_internal.h

Andreas Rheinhardt committed 2 years ago

Commit 0e5f7121 parent 888e2c010 files · +11 −6Browse files

Unified · Split

10 files

libavcodec/bmpenc.c +1 −1
libavcodec/gif.c +1 −0
libavcodec/pcxenc.c +1 −1
libavcodec/xwdenc.c +1 −0
libavfilter/framepool.c +1 −0
libavfilter/vf_scale.c +1 −0
libavformat/av1.c +1 −0
libavutil/imgutils.c +0 −1
libavutil/imgutils_internal.h +4 −0
libavutil/internal.h +0 −3

libavcodec/bmpenc.c+1−1

@@ -22,8 +22,8 @@ · 21 unmodified lines
22	22
23	23	#include "config.h"
24	24
25		−#include "libavutil/imgutils.h"
26	25	#include "libavutil/avassert.h"
	26	+#include "libavutil/imgutils_internal.h"
27	27	#include "avcodec.h"
28	28	#include "bytestream.h"
29	29	#include "bmp.h"

libavcodec/gif.c+1−0

@@ -30,6 +30,7 @@ · 29 unmodified lines
30	30	* @see http://www.w3.org/Graphics/GIF/spec-gif89a.txt
31	31	*/
32	32
	33	+#include "libavutil/imgutils_internal.h"
33	34	#include "libavutil/mem.h"
34	35	#include "libavutil/opt.h"
35	36	#include "avcodec.h"

libavcodec/pcxenc.c+1−1

@@ -26,9 +26,9 @@ · 25 unmodified lines
26	26	* @see http://bespin.org/~qz/pc-gpe/pcx.txt
27	27	*/
28	28
	29	+#include "libavutil/imgutils_internal.h"
29	30	#include "avcodec.h"
30	31	#include "bytestream.h"
31		−#include "libavutil/imgutils.h"
32	32	#include "codec_internal.h"
33	33	#include "encode.h"
34	34

libavcodec/xwdenc.c+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	21	*/
22	22
	23	+#include "libavutil/imgutils_internal.h"
23	24	#include "libavutil/pixdesc.h"
24	25	#include "avcodec.h"
25	26	#include "bytestream.h"

libavfilter/framepool.c+1−0

@@ -24,6 +24,7 @@ · 23 unmodified lines
24	24	#include "libavutil/buffer.h"
25	25	#include "libavutil/frame.h"
26	26	#include "libavutil/imgutils.h"
	27	+#include "libavutil/imgutils_internal.h"
27	28	#include "libavutil/mem.h"
28	29	#include "libavutil/pixfmt.h"
29	30

libavfilter/vf_scale.c+1−0

@@ -33,6 +33,7 @@ · 32 unmodified lines
33	33	#include "scale_eval.h"
34	34	#include "video.h"
35	35	#include "libavutil/eval.h"
	36	+#include "libavutil/imgutils_internal.h"
36	37	#include "libavutil/internal.h"
37	38	#include "libavutil/mem.h"
38	39	#include "libavutil/opt.h"

libavformat/av1.c+1−0

@@ -21,6 +21,7 @@ · 20 unmodified lines
21	21
22	22	#include "libavutil/avassert.h"
23	23	#include "libavutil/mem.h"
	24	+#include "libavutil/pixfmt.h"
24	25	#include "libavcodec/av1.h"
25	26	#include "libavcodec/av1_parse.h"
26	27	#include "libavcodec/defs.h"

libavutil/imgutils.c+0−1

@@ -25,7 +25,6 @@ · 24 unmodified lines
25	25	#include "common.h"
26	26	#include "imgutils.h"
27	27	#include "imgutils_internal.h"
28		−#include "internal.h"
29	28	#include "intreadwrite.h"
30	29	#include "log.h"
31	30	#include "mathematics.h"

libavutil/imgutils_internal.h+4−0

@@ -22,6 +22,10 @@ · 21 unmodified lines
22	22	#include <stddef.h>
23	23	#include <stdint.h>
24	24
	25	+#include "pixfmt.h"
	26	+
	27	+int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
	28	+
25	29	int ff_image_copy_plane_uc_from_x86(uint8_t *dst, ptrdiff_t dst_linesize,
26	30	const uint8_t *src, ptrdiff_t src_linesize,
27	31	ptrdiff_t bytewidth, int height);

libavutil/internal.h+0−3

@@ -42,7 +42,6 @@ · 41 unmodified lines
42	42	#include "attributes.h"
43	43	#include "libm.h"
44	44	#include "macros.h"
45		−#include "pixfmt.h"
46	45
47	46	#ifndef attribute_align_arg
48	47	#if ARCH_X86_32 && AV_GCC_VERSION_AT_LEAST(4,2)
@@ -152,8 +151,6 @@ void avpriv_request_sample(void *avc, · 103 unmodified lines
152	151	#define SUINT32 uint32_t
153	152	#endif
154	153
155		−int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
156		−
157	154	static av_always_inline av_const int avpriv_mirror(int x, int w)
158	155	{
159	156	if (!w)