RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

add FF_API_SET_STRING_OLD define to disable the deprecated av_set_string API

Browse Source 
Originally committed as revision 25276 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-09-30 20:34:35 +00:00
parent 0743de4ffd
commit 838dc131f1
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/avcodec.h
View File

@ -69,6 +69,9 @@
#ifndef FF_API_USE_LPC #ifndef FF_API_USE_LPC
#define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53) #define FF_API_USE_LPC (LIBAVCODEC_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_SET_STRING_OLD
#define FF_API_SET_STRING_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

2
libavcodec/opt.c
View File

@ -65,7 +65,7 @@ FF_SYMVER(void, av_opt_set_defaults2, (void *s, int mask, int flags), "LIBAVCODE
} }
#endif #endif
#if LIBAVCODEC_VERSION_MAJOR < 53 #if FF_API_SET_STRING_OLD
const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){ const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
const AVOption *o; const AVOption *o;
if (av_set_string3(obj, name, val, alloc, &o) < 0) if (av_set_string3(obj, name, val, alloc, &o) < 0)

2
libavcodec/opt.h
View File

@ -31,7 +31,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#if LIBAVCODEC_VERSION_MAJOR < 53 #if FF_API_SET_STRING_OLD
/** /**
* @see av_set_string2() * @see av_set_string2()
*/ */