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

add FF_API_VIDEO_OLD define to disable the deprecated decode_video API

Browse Source 
Originally committed as revision 25272 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-09-30 19:51:22 +00:00
parent d8e456400e
commit 164bc38c26
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/avcodec.h
View File

@ -60,6 +60,9 @@
#ifndef FF_API_AUDIO_OLD #ifndef FF_API_AUDIO_OLD
#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) #define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif #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_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000 #define AV_TIME_BASE 1000000
@ -3524,7 +3527,7 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
int *frame_size_ptr, int *frame_size_ptr,
AVPacket *avpkt); AVPacket *avpkt);
#if LIBAVCODEC_VERSION_MAJOR < 53 #if FF_API_VIDEO_OLD
/** /**
* Decode a video frame from buf into picture. * Decode a video frame from buf into picture.
* Wrapper function which calls avcodec_decode_video2. * Wrapper function which calls avcodec_decode_video2.

2
libavcodec/utils.c
View File

@ -591,7 +591,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
return ret; return ret;
} }
#if LIBAVCODEC_VERSION_MAJOR < 53 #if FF_API_VIDEO_OLD
int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture, int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr, int *got_picture_ptr,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)