diff options
| author | James Almer <jamrial@gmail.com> | 2014-09-14 21:17:03 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2014-10-05 17:09:56 -0300 |
| commit | 3e5752098275e035f8b3d1ba475de80fcb62a3e5 (patch) | |
| tree | 8e9457508bba7dd834d72c6e5725797823120834 | |
| parent | 71718de814471b7ca871f600cd9368deb56b3972 (diff) | |
| download | ffmpeg-3e5752098275e035f8b3d1ba475de80fcb62a3e5.tar.gz | |
avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavutil/samplefmt.c | 8 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
2 files changed, 0 insertions, 11 deletions
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 |