diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 14:48:39 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:37:21 +0200 |
| commit | e89e5afdd04a0f081ecc38b528c1147f204027d7 (patch) | |
| tree | a759547d2234acc7b85c3573f250c24bb4ab848d /libavcodec | |
| parent | 9b4f1cdb6a7e838c0261109e8a6262e78657ee7b (diff) | |
| download | ffmpeg-e89e5afdd04a0f081ecc38b528c1147f204027d7.tar.gz | |
lavc: remove the FF_API_VIDEO_OLD cruft.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 19 | ||||
| -rw-r--r-- | libavcodec/utils.c | 16 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 38 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cf3664a973..78dd20822a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3741,25 +3741,6 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, 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. * Some decoders may support multiple frames in a single AVPacket, such diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e90be4614d..89bd4a1f55 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -631,22 +631,6 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, 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 *got_picture_ptr, AVPacket *avpkt) diff --git a/libavcodec/version.h b/libavcodec/version.h index 8c891e248e..2d460b9744 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_VIDEO_OLD -#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) -#endif #ifndef FF_API_SUBTITLE_OLD #define FF_API_SUBTITLE_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif |