Browse Source

add FF_API_SET_STRING_OLD define to disable the deprecated av_set_string API

Originally committed as revision 25276 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Aurelien Jacobs 15 years ago
parent
commit
838dc131f1
3 changed files with 5 additions and 2 deletions
  1. +3
    -0
      libavcodec/avcodec.h
  2. +1
    -1
      libavcodec/opt.c
  3. +1
    -1
      libavcodec/opt.h

+ 3
- 0
libavcodec/avcodec.h View File

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


+ 1
- 1
libavcodec/opt.c View File

@@ -65,7 +65,7 @@ FF_SYMVER(void, av_opt_set_defaults2, (void *s, int mask, int flags), "LIBAVCODE
}
#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 *o;
if (av_set_string3(obj, name, val, alloc, &o) < 0)


+ 1
- 1
libavcodec/opt.h View File

@@ -31,7 +31,7 @@
#include "avcodec.h"
#include "libavutil/opt.h"

#if LIBAVCODEC_VERSION_MAJOR < 53
#if FF_API_SET_STRING_OLD
/**
* @see av_set_string2()
*/


Loading…
Cancel
Save