highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add FF_API_SUBTITLE_OLD define to disable the deprecated decode_subtitle API

Browse Source 
Originally committed as revision 25273 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2010-09-30 20:12:46 +00:00
parent 164bc38c26
commit 448ce9258c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/avcodec.h
View File

@@ -63,6 +63,9 @@
#ifndef FF_API_VIDEO_OLD #ifndef FF_API_VIDEO_OLD
#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif #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_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000 #define AV_TIME_BASE 1000000
@@ -3590,7 +3593,7 @@ int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr, int *got_picture_ptr,
AVPacket *avpkt); AVPacket *avpkt);
#if LIBAVCODEC_VERSION_MAJOR < 53 #if FF_API_SUBTITLE_OLD
/* Decode a subtitle message. Return -1 if error, otherwise return the /* Decode a subtitle message. Return -1 if error, otherwise return the
* number of bytes used. If no subtitle could be decompressed, * number of bytes used. If no subtitle could be decompressed,
* got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */ * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */

2
libavcodec/utils.c
View File

@@ -671,7 +671,7 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
return ret; return ret;
} }
#if LIBAVCODEC_VERSION_MAJOR < 53 #if FF_API_SUBTITLE_OLD
int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub, int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
int *got_sub_ptr, int *got_sub_ptr,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)