diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-30 20:12:46 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-30 20:12:46 +0000 |
| commit | 448ce9258c145dfe17a4616d15677f412bef7304 (patch) | |
| tree | bc1fc9f83758efb906bcc6581125cc03134c5e8d | |
| parent | 164bc38c2603e8738237d61a183f95e283f3e491 (diff) | |
| download | ffmpeg-448ce9258c145dfe17a4616d15677f412bef7304.tar.gz | |
add FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API
Originally committed as revision 25273 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/utils.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 880ce5a241..e2e4d9dbd6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -63,6 +63,9 @@ #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 #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -3590,7 +3593,7 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, AVPacket *avpkt); -#if LIBAVCODEC_VERSION_MAJOR < 53 +#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. */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0d27163d6d..ffd34eee14 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -671,7 +671,7 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa return ret; } -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_SUBTITLE_OLD int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int *got_sub_ptr, const uint8_t *buf, int buf_size) |