diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 12:41:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 12:41:15 +0200 |
| commit | 22a0249debb1b7dceee4820b6c067be3a7e88ccc (patch) | |
| tree | a00ecb65001d36aaff2bdffa7f15e0eeae6925ee /libavutil | |
| parent | 71d008ebe4f96974433eecfd3575bc82eb4b06a8 (diff) | |
| parent | bb41115d56930b9f5d59e79dca254d1201246967 (diff) | |
Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'
* commit 'bb41115d56930b9f5d59e79dca254d1201246967':
imgutils: Do not declare avpriv_set_systematic_pal2 in the public header
Conflicts:
libavutil/internal.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/imgutils.h | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h index 775baaa3b7..23282a38fa 100644 --- a/libavutil/imgutils.h +++ b/libavutil/imgutils.h @@ -205,8 +205,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 ea3c31e4fb..2d1b37b719 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -39,6 +39,7 @@ #include "timer.h" #include "cpu.h" #include "dict.h" +#include "pixfmt.h" #include "version.h" #if ARCH_X86 @@ -256,6 +257,8 @@ 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); + #if FF_API_GET_CHANNEL_LAYOUT_COMPAT uint64_t ff_get_channel_layout(const char *name, int compat); #endif diff --git a/libavutil/version.h b/libavutil/version.h index 9af8f5fb77..9b38c09718 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -57,7 +57,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 95 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |