diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-30 15:37:01 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-30 15:37:01 +0000 |
| commit | a377cfa6c2d68f6feec4cb2aa9b87d7ec07340e7 (patch) | |
| tree | 1a4b9fadabff9f680787ae4df81ba8f7ff71cf1f /libavcodec/avcodec.h | |
| parent | e2f0214a0bf42558b565f7706e916f569fce23b8 (diff) | |
| download | ffmpeg-a377cfa6c2d68f6feec4cb2aa9b87d7ec07340e7.tar.gz | |
add FF_API_AUDIO_OLD define to disable the deprecated decode_audio API
Originally committed as revision 25270 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3667e723d6..e701a82857 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -57,6 +57,9 @@ #ifndef FF_API_OPT_SHOW #define FF_API_OPT_SHOW (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_AUDIO_OLD +#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -2998,7 +3001,7 @@ struct AVResampleContext; typedef struct ReSampleContext ReSampleContext; -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_AUDIO_OLD /** * @deprecated Use av_audio_resample_init() instead. */ @@ -3459,7 +3462,7 @@ int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, */ int avcodec_open(AVCodecContext *avctx, AVCodec *codec); -#if LIBAVCODEC_VERSION_MAJOR < 53 +#if FF_API_AUDIO_OLD /** * Decode an audio frame from buf into samples. * Wrapper function which calls avcodec_decode_audio3. |