diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-01 10:26:28 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-01 10:26:28 +0000 |
| commit | eda7c983c1bd7d4fc51c22a0349bde417be48d9c (patch) | |
| tree | 58b00fb9160315a0bf7b2da2c3f26952d3b993cf /libavcodec/avcodec.h | |
| parent | 625bac784b818733b403e61cddfec3d20702f520 (diff) | |
| download | ffmpeg-eda7c983c1bd7d4fc51c22a0349bde417be48d9c.tar.gz | |
add FF_API_PALETTE_CONTROL define to drop usage of AVPaletteControl
and delay this transition to v54 as it is currently not functional
Originally committed as revision 25016 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 620f4ece24..b4b0cecc88 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -43,6 +43,14 @@ #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) +/** + * Those FF_API_* defines are not part of public API. + * They may change, break or disappear at any time. + */ +#ifndef FF_API_PALETTE_CONTROL +#define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54) +#endif + #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} @@ -2025,12 +2033,14 @@ typedef struct AVCodecContext { */ int lmax; +#if FF_API_PALETTE_CONTROL /** * palette control structure * - encoding: ??? (no palette-enabled encoder yet) * - decoding: Set by user. */ struct AVPaletteControl *palctrl; +#endif /** * noise reduction strength @@ -2852,7 +2862,7 @@ typedef struct AVPicture { int linesize[4]; ///< number of bytes per line } AVPicture; -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_PALETTE_CONTROL /** * AVPaletteControl * This structure defines a method for communicating palette changes |