@@ -3741,25 +3741,6 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, | |||||
int *frame_size_ptr, | int *frame_size_ptr, | ||||
AVPacket *avpkt); | AVPacket *avpkt); | ||||
#if FF_API_VIDEO_OLD | |||||
/** | |||||
* Decode a video frame from buf into picture. | |||||
* Wrapper function which calls avcodec_decode_video2. | |||||
* | |||||
* @deprecated Use avcodec_decode_video2 instead. | |||||
* @param avctx the codec context | |||||
* @param[out] picture The AVFrame in which the decoded video frame will be stored. | |||||
* @param[in] buf the input buffer | |||||
* @param[in] buf_size the size of the input buffer in bytes | |||||
* @param[in,out] got_picture_ptr Zero if no frame could be decompressed, otherwise, it is nonzero. | |||||
* @return On error a negative value is returned, otherwise the number of bytes | |||||
* used or zero if no frame could be decompressed. | |||||
*/ | |||||
attribute_deprecated int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, | |||||
int *got_picture_ptr, | |||||
const uint8_t *buf, int buf_size); | |||||
#endif | |||||
/** | /** | ||||
* Decode the video frame of size avpkt->size from avpkt->data into picture. | * Decode the video frame of size avpkt->size from avpkt->data into picture. | ||||
* Some decoders may support multiple frames in a single AVPacket, such | * Some decoders may support multiple frames in a single AVPacket, such | ||||
@@ -631,22 +631,6 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, | |||||
return ret; | return ret; | ||||
} | } | ||||
#if FF_API_VIDEO_OLD | |||||
int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, | |||||
int *got_picture_ptr, | |||||
const uint8_t *buf, int buf_size) | |||||
{ | |||||
AVPacket avpkt; | |||||
av_init_packet(&avpkt); | |||||
avpkt.data = buf; | |||||
avpkt.size = buf_size; | |||||
// HACK for CorePNG to decode as normal PNG by default | |||||
avpkt.flags = AV_PKT_FLAG_KEY; | |||||
return avcodec_decode_video2(avctx, picture, got_picture_ptr, &avpkt); | |||||
} | |||||
#endif | |||||
int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, | int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, | ||||
int *got_picture_ptr, | int *got_picture_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_VIDEO_OLD | |||||
#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) | |||||
#endif | |||||
#ifndef FF_API_SUBTITLE_OLD | #ifndef FF_API_SUBTITLE_OLD | ||||
#define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) | #define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) | ||||
#endif | #endif | ||||