Commit dd4c8d4c authored by diego's avatar diego

Remove deprecated functions and structures on next version bump.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18110 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 4f15168c
...@@ -2496,6 +2496,7 @@ typedef struct AVPicture { ...@@ -2496,6 +2496,7 @@ typedef struct AVPicture {
int linesize[4]; ///< number of bytes per line int linesize[4]; ///< number of bytes per line
} AVPicture; } AVPicture;
#if LIBAVCODEC_VERSION_MAJOR < 53
/** /**
* AVPaletteControl * AVPaletteControl
* This structure defines a method for communicating palette changes * This structure defines a method for communicating palette changes
...@@ -2519,6 +2520,7 @@ typedef struct AVPaletteControl { ...@@ -2519,6 +2520,7 @@ typedef struct AVPaletteControl {
unsigned int palette[AVPALETTE_COUNT]; unsigned int palette[AVPALETTE_COUNT];
} AVPaletteControl attribute_deprecated; } AVPaletteControl attribute_deprecated;
#endif
enum AVSubtitleType { enum AVSubtitleType {
SUBTITLE_NONE, SUBTITLE_NONE,
...@@ -3269,12 +3271,14 @@ AVCodecParser *av_parser_next(AVCodecParser *c); ...@@ -3269,12 +3271,14 @@ AVCodecParser *av_parser_next(AVCodecParser *c);
void av_register_codec_parser(AVCodecParser *parser); void av_register_codec_parser(AVCodecParser *parser);
AVCodecParserContext *av_parser_init(int codec_id); AVCodecParserContext *av_parser_init(int codec_id);
#if LIBAVCODEC_VERSION_MAJOR < 53
attribute_deprecated attribute_deprecated
int av_parser_parse(AVCodecParserContext *s, int av_parser_parse(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size, uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size, const uint8_t *buf, int buf_size,
int64_t pts, int64_t dts); int64_t pts, int64_t dts);
#endif
/** /**
* Parse a packet. * Parse a packet.
......
...@@ -37,6 +37,7 @@ const uint8_t ff_log2_run[32]={ ...@@ -37,6 +37,7 @@ const uint8_t ff_log2_run[32]={
8, 9,10,11,12,13,14,15 8, 9,10,11,12,13,14,15
}; };
#if LIBAVCODEC_VERSION_MAJOR < 53
/** /**
* Same as av_mallocz_static(), but does a realloc. * Same as av_mallocz_static(), but does a realloc.
* *
...@@ -53,6 +54,7 @@ static void *ff_realloc_static(void *ptr, unsigned int size) ...@@ -53,6 +54,7 @@ static void *ff_realloc_static(void *ptr, unsigned int size)
{ {
return av_realloc(ptr, size); return av_realloc(ptr, size);
} }
#endif
void align_put_bits(PutBitContext *s) void align_put_bits(PutBitContext *s)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment