| @@ -3785,15 +3785,6 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, | |||||
| int *got_picture_ptr, | int *got_picture_ptr, | ||||
| AVPacket *avpkt); | 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. | * Decode a subtitle message. | ||||
| * Return a negative value on error, otherwise return the number of bytes used. | * Return a negative value on error, otherwise return the number of bytes used. | ||||
| @@ -692,20 +692,6 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa | |||||
| return ret; | 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 avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, | ||||
| int *got_sub_ptr, | int *got_sub_ptr, | ||||
| AVPacket *avpkt) | AVPacket *avpkt) | ||||
| @@ -41,9 +41,6 @@ | |||||
| #ifndef FF_API_PALETTE_CONTROL | #ifndef FF_API_PALETTE_CONTROL | ||||
| #define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54) | #define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54) | ||||
| #endif | #endif | ||||
| #ifndef FF_API_SUBTITLE_OLD | |||||
| #define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) | |||||
| #endif | |||||
| #ifndef FF_API_USE_LPC | #ifndef FF_API_USE_LPC | ||||
| #define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) | #define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) | ||||
| #endif | #endif | ||||