lavc: remove disabled FF_API_PALETTE_CONTROL cruft.
This commit is contained in:
parent
9ce2a91b84
commit
6c8dab98b8
@ -2282,15 +2282,6 @@ typedef struct AVCodecContext {
|
|||||||
*/
|
*/
|
||||||
int lmax;
|
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
|
* noise reduction strength
|
||||||
* - encoding: Set by user.
|
* - encoding: Set by user.
|
||||||
@ -3214,29 +3205,6 @@ typedef struct AVPicture {
|
|||||||
|
|
||||||
#define AVPALETTE_SIZE 1024
|
#define AVPALETTE_SIZE 1024
|
||||||
#define AVPALETTE_COUNT 256
|
#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 {
|
enum AVSubtitleType {
|
||||||
SUBTITLE_NONE,
|
SUBTITLE_NONE,
|
||||||
|
@ -38,9 +38,6 @@
|
|||||||
* Those FF_API_* defines are not part of public API.
|
* Those FF_API_* defines are not part of public API.
|
||||||
* They may change, break or disappear at any time.
|
* 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
|
#ifndef FF_API_OLD_SAMPLE_FMT
|
||||||
#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54)
|
#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54)
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user