mirror of https://git.ffmpeg.org/ffmpeg.git
avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
71718de814
commit
3e57520982
|
@ -165,11 +165,7 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
|
||||||
if (linesize)
|
if (linesize)
|
||||||
*linesize = line_size;
|
*linesize = line_size;
|
||||||
|
|
||||||
#if FF_API_SAMPLES_UTILS_RETURN_ZERO
|
|
||||||
return 0;
|
|
||||||
#else
|
|
||||||
return buf_size;
|
return buf_size;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
|
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);
|
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;
|
return size;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels,
|
int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels,
|
||||||
|
|
|
@ -101,9 +101,6 @@
|
||||||
#ifndef FF_API_CPU_FLAG_MMX2
|
#ifndef FF_API_CPU_FLAG_MMX2
|
||||||
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
|
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||||
#endif
|
#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
|
#ifndef FF_API_LLS_PRIVATE
|
||||||
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
|
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue