diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index 3d415a183f..c605b5ebdf 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -165,11 +165,7 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, if (linesize) *linesize = line_size; -#if FF_API_SAMPLES_UTILS_RETURN_ZERO - return 0; -#else return buf_size; -#endif } int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, @@ -194,11 +190,7 @@ int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, av_samples_set_silence(audio_data, 0, nb_samples, nb_channels, sample_fmt); -#if FF_API_SAMPLES_UTILS_RETURN_ZERO - return 0; -#else return size; -#endif } int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels, diff --git a/libavutil/version.h b/libavutil/version.h index e38da7cf33..cf2cc96bf6 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -101,9 +101,6 @@ #ifndef FF_API_CPU_FLAG_MMX2 #define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55) #endif -#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO -#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54) -#endif #ifndef FF_API_LLS_PRIVATE #define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55) #endif