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

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

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

  * @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"

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

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

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

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

@@ -22,6 +22,10 @@ · 21 unmodified lines
22	#include <stddef.h>	22	#include <stddef.h>
23	#include <stdint.h>	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	int ff_image_copy_plane_uc_from_x86(uint8_t *dst, ptrdiff_t dst_linesize,	29	int ff_image_copy_plane_uc_from_x86(uint8_t *dst, ptrdiff_t dst_linesize,
26	const uint8_t *src, ptrdiff_t src_linesize,	30	const uint8_t *src, ptrdiff_t src_linesize,
27	ptrdiff_t bytewidth, int height);	31	ptrdiff_t bytewidth, int height);

 #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)
 #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)

Keyboard shortcuts