diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-10-31 10:38:10 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-11-03 13:13:24 +0100 |
| commit | 5a6e6dcaa4d237257592fbe621fa9325ac860ba0 (patch) | |
| tree | 5d56406124de8ca9bf9537d03f12ce34a04eca39 | |
| parent | cf49d5907aae5b7be4d0e3e30d12bf85a2fa87f3 (diff) | |
| download | ffmpeg-5a6e6dcaa4d237257592fbe621fa9325ac860ba0.tar.gz | |
lavc: drop deprecated audio_convert API at the next major bump
Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
| -rw-r--r-- | libavcodec/audioconvert.c | 4 | ||||
| -rw-r--r-- | libavcodec/audioconvert.h | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 5d8a3485e6..5e46fae2df 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -32,6 +32,8 @@ #include "avcodec.h" #include "audioconvert.h" +#if FF_API_AUDIO_CONVERT + struct AVAudioConvert { int in_channels, out_channels; int fmt_pair; @@ -114,3 +116,5 @@ if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\ } return 0; } + +#endif /* FF_API_AUDIO_CONVERT */ diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h index 7e7a1bc45f..556ab31058 100644 --- a/libavcodec/audioconvert.h +++ b/libavcodec/audioconvert.h @@ -26,8 +26,11 @@ /** * @file * Audio format conversion routines + * This interface is deprecated and will be dropped in a future + * version. You should use the libswresample library instead. */ +#if FF_API_AUDIO_CONVERT #include "libavutil/cpu.h" #include "avcodec.h" @@ -76,4 +79,6 @@ int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6], const int in_stride[6], int len); +#endif /* FF_API_AUDIO_CONVERT */ + #endif /* AVCODEC_AUDIOCONVERT_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index ac3af67210..520a040a59 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -73,8 +73,11 @@ #ifndef FF_API_CODEC_ID #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_AUDIO_CONVERT +#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #ifndef FF_API_AVCODEC_RESAMPLE -#define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) +#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT #endif #ifndef FF_API_DEINTERLACE #define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 56) |