diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 14:50:06 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:39:40 +0200 |
| commit | db4d3a7421ec70de0d5ccd8a9f99b46b5c780d23 (patch) | |
| tree | 117a36cdc421513c8cc1856c3d5dcf104083db59 | |
| parent | e89e5afdd04a0f081ecc38b528c1147f204027d7 (diff) | |
lavc: remove the FF_API_SUBTITLE_OLD cruft.
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/utils.c | 14 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 26 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 78dd20822a..c47b0065e7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3785,15 +3785,6 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt); -#if FF_API_SUBTITLE_OLD -/* Decode a subtitle message. Return -1 if error, otherwise return the - * number of bytes used. If no subtitle could be decompressed, - * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */ -attribute_deprecated int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, - int *got_sub_ptr, - const uint8_t *buf, int buf_size); -#endif - /** * Decode a subtitle message. * Return a negative value on error, otherwise return the number of bytes used. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 89bd4a1f55..aa2e55693c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -692,20 +692,6 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa return ret; } -#if FF_API_SUBTITLE_OLD -int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, - int *got_sub_ptr, - const uint8_t *buf, int buf_size) -{ - AVPacket avpkt; - av_init_packet(&avpkt); - avpkt.data = buf; - avpkt.size = buf_size; - - return avcodec_decode_subtitle2(avctx, sub, got_sub_ptr, &avpkt); -} -#endif - int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, AVPacket *avpkt) diff --git a/libavcodec/version.h b/libavcodec/version.h index 2d460b9744..d3dd04f169 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -41,9 +41,6 @@ #ifndef FF_API_PALETTE_CONTROL #define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54) #endif -#ifndef FF_API_SUBTITLE_OLD -#define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) -#endif #ifndef FF_API_USE_LPC #define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) #endif |