From 164bc38c2603e8738237d61a183f95e283f3e491 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 30 Sep 2010 19:51:22 +0000 Subject: [PATCH] add FF_API_VIDEO_OLD define to disable the deprecated decode_video API Originally committed as revision 25272 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 5 ++++- libavcodec/utils.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e701a82857..880ce5a241 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -60,6 +60,9 @@ #ifndef FF_API_AUDIO_OLD #define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_VIDEO_OLD +#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -3524,7 +3527,7 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt); -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_VIDEO_OLD /** * Decode a video frame from buf into picture. * Wrapper function which calls avcodec_decode_video2. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 69439b896b..0d27163d6d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -591,7 +591,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, return ret; } -#if LIBAVCODEC_VERSION_MAJOR < 53 +#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)