diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:33 +0100 |
| commit | 6c8dab98b87040ab3d5d31b91a46eb4aed8f1f30 (patch) | |
| tree | 55f2843081ebd35cdc48c9d32ae69aecbea195bc | |
| parent | 9ce2a91b842bdb99fae0f153c5317d786a3f38d8 (diff) | |
| download | ffmpeg-6c8dab98b87040ab3d5d31b91a46eb4aed8f1f30.tar.gz | |
lavc: remove disabled FF_API_PALETTE_CONTROL cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 32 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 0 insertions, 35 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 08a79f992c..5a5c4be6bb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2282,15 +2282,6 @@ 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 * - encoding: Set by user. @@ -3214,29 +3205,6 @@ typedef struct AVPicture { #define AVPALETTE_SIZE 1024 #define AVPALETTE_COUNT 256 -#if FF_API_PALETTE_CONTROL -/** - * AVPaletteControl - * This structure defines a method for communicating palette changes - * between and demuxer and a decoder. - * - * @deprecated Use AVPacket to send palette changes instead. - * This is totally broken. - */ -typedef struct AVPaletteControl { - - /* Demuxer sets this to 1 to indicate the palette has changed; - * decoder resets to 0. */ - int palette_changed; - - /* 4-byte ARGB palette entries, stored in native byte order; note that - * the individual palette components should be on a 8-bit scale; if - * the palette data comes from an IBM VGA native format, the component - * data is probably 6 bits in size and needs to be scaled. */ - unsigned int palette[AVPALETTE_COUNT]; - -} AVPaletteControl attribute_deprecated; -#endif enum AVSubtitleType { SUBTITLE_NONE, diff --git a/libavcodec/version.h b/libavcodec/version.h index 570c415835..f3a8be6294 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -38,9 +38,6 @@ * 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 #ifndef FF_API_OLD_SAMPLE_FMT #define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54) #endif |