From f2ee0656389a6f9db348ce59c4fbb3c58dd648af Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Tue, 10 Apr 2012 16:34:16 +0200
Subject: [PATCH] lavu/pixfmt: move AVPALETTE_SIZE and _COUNT to pixfmt.h
Move AVPALETTE_SIZE and AVPALETTE_COUNT definition from
libavcodec/avcodec.h to libavutil/pixfmt.h.
The definition is more useful in libavutil, where it can be shared for
example by libavfilter and libswscale.
---
doc/APIchanges | 4 ++++
libavcodec/avcodec.h | 3 ---
libavutil/avutil.h | 2 +-
libavutil/pixfmt.h | 3 +++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index d00416c9c6c..b6b78b52378 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,10 @@ libavutil: 2011-04-18
API changes, most recent first:
+2012-05-24 - xxxxxxx - lavu 51.54.100
+ Move AVPALETTE_SIZE and AVPALETTE_COUNT macros from
+ libavcodec/avcodec.h to libavutil/pixfmt.h.
+
2012-05-07 - xxxxxxx - lavf 54.5.100
Add av_guess_sample_aspect_ratio() function.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9dfb64b7203..96ca401c2fa 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3130,9 +3130,6 @@ typedef struct AVPicture {
* @}
*/
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-
enum AVSubtitleType {
SUBTITLE_NONE,
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 130a4dac7f7..ee8b0713832 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -153,7 +153,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 53
+#define LIBAVUTIL_VERSION_MINOR 54
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 1e81a2ae378..820cd3f190d 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -29,6 +29,9 @@
#include "libavutil/avconfig.h"
+#define AVPALETTE_SIZE 1024
+#define AVPALETTE_COUNT 256
+
/**
* Pixel format.
*
--
GitLab