diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-21 13:51:29 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-21 13:51:29 +0000 |
| commit | 2bbd85719c9402199ccbac60b6d6322f813e0885 (patch) | |
| tree | 5de5ae4c0dc470e56d00508beca79fccf2b687b3 /libavcodec | |
| parent | 986b6f8f7360215bea51dc66ae97412ac67c136e (diff) | |
Remove deprecated functions and structures on next version bump.
Originally committed as revision 18110 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/bitstream.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3f89ea9aa4..a901b0c87b 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 6781fe6cb0..5d9bd32707 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) { |