summaryrefslogtreecommitdiffstats
path: root/libavutil/samplefmt.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-09-14 21:17:03 -0300
committerJames Almer <jamrial@gmail.com>2014-10-05 17:09:56 -0300
commit3e5752098275e035f8b3d1ba475de80fcb62a3e5 (patch)
tree8e9457508bba7dd834d72c6e5725797823120834 /libavutil/samplefmt.c
parent71718de814471b7ca871f600cd9368deb56b3972 (diff)
downloadffmpeg-streaming-3e5752098275e035f8b3d1ba475de80fcb62a3e5.zip
ffmpeg-streaming-3e5752098275e035f8b3d1ba475de80fcb62a3e5.tar.gz
avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/samplefmt.c')
-rw-r--r--libavutil/samplefmt.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index 3d415a1..c605b5e 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,
OpenPOWER on IntegriCloud