mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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>
This commit is contained in:
commit
22a0249deb
@ -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);
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
@ -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
|
||||
|
@ -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, \
|
||||
|
Loading…
Reference in New Issue
Block a user