Browse Source

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
tags/n0.8
Aurelien Jacobs 14 years ago
parent
commit
a377cfa6c2
3 changed files with 7 additions and 4 deletions
  1. +5
    -2
      libavcodec/avcodec.h
  2. +1
    -1
      libavcodec/resample.c
  3. +1
    -1
      libavcodec/utils.c

+ 5
- 2
libavcodec/avcodec.h View File

@@ -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.


+ 1
- 1
libavcodec/resample.c View File

@@ -217,7 +217,7 @@ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
return s;
}

#if LIBAVCODEC_VERSION_MAJOR < 53
#if FF_API_AUDIO_OLD
ReSampleContext *audio_resample_init(int output_channels, int input_channels,
int output_rate, int input_rate)
{


+ 1
- 1
libavcodec/utils.c View File

@@ -630,7 +630,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi
return ret;
}

#if LIBAVCODEC_VERSION_MAJOR < 53
#if FF_API_AUDIO_OLD
int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
int *frame_size_ptr,
const uint8_t *buf, int buf_size)


Loading…
Cancel
Save