From: diego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Sat, 21 Mar 2009 13:51:29 +0000 (+0000)
Subject: Remove deprecated functions and structures on next version bump.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/dd4c8d4c60c5eb2eba98047d27afbdba3d3ba762

Remove deprecated functions and structures on next version bump.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18110 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3f89ea9aa..a901b0c87 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2496,6 +2496,7 @@ typedef struct AVPicture {
     int linesize[4];       ///< number of bytes per line
 } AVPicture;
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
  * AVPaletteControl
  * This structure defines a method for communicating palette changes
@@ -2519,6 +2520,7 @@ typedef struct AVPaletteControl {
     unsigned int palette[AVPALETTE_COUNT];
 
 } AVPaletteControl attribute_deprecated;
+#endif
 
 enum AVSubtitleType {
     SUBTITLE_NONE,
@@ -3269,12 +3271,14 @@ AVCodecParser *av_parser_next(AVCodecParser *c);
 void av_register_codec_parser(AVCodecParser *parser);
 AVCodecParserContext *av_parser_init(int codec_id);
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 attribute_deprecated
 int av_parser_parse(AVCodecParserContext *s,
                     AVCodecContext *avctx,
                     uint8_t **poutbuf, int *poutbuf_size,
                     const uint8_t *buf, int buf_size,
                     int64_t pts, int64_t dts);
+#endif
 
 /**
  * Parse a packet.
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 6781fe6cb..5d9bd3270 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -37,6 +37,7 @@ const uint8_t ff_log2_run[32]={
  8, 9,10,11,12,13,14,15
 };
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 /**
  * Same as av_mallocz_static(), but does a realloc.
  *
@@ -53,6 +54,7 @@ static void *ff_realloc_static(void *ptr, unsigned int size)
 {
     return av_realloc(ptr, size);
 }
+#endif
 
 void align_put_bits(PutBitContext *s)
 {