[SCM] libav/experimental: imgutils: Do not declare avpriv_set_systematic_pal2 in the public header
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:04:10 UTC 2014
The following commit has been merged in the experimental branch:
commit bb41115d56930b9f5d59e79dca254d1201246967
Author: Diego Biurrun <diego at biurrun.de>
Date: Sun Aug 3 11:06:06 2014 -0700
imgutils: Do not declare avpriv_set_systematic_pal2 in the public header
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h
index 313037a..50fa815 100644
--- a/libavutil/imgutils.h
+++ b/libavutil/imgutils.h
@@ -143,8 +143,6 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo
*/
int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar);
-int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
-
/**
* @}
*/
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 210c524..067c6ca 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -37,6 +37,7 @@
#include "config.h"
#include "attributes.h"
#include "dict.h"
+#include "pixfmt.h"
#if ARCH_X86
# include "x86/emms.h"
@@ -219,4 +220,6 @@ void avpriv_request_sample(void *avc,
*/
int avpriv_open(const char *filename, int flags, ...);
+int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
+
#endif /* AVUTIL_INTERNAL_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index 820fdc6..c5bd927 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -55,7 +55,7 @@
#define LIBAVUTIL_VERSION_MAJOR 53
#define LIBAVUTIL_VERSION_MINOR 20
-#define LIBAVUTIL_VERSION_MICRO 0
+#define LIBAVUTIL_VERSION_MICRO 1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list