[FFmpeg-cvslog] tests/audio_fifo: fix buffer allocation for non planar formats

James Almer git at videolan.org
Sat Dec 24 05:48:15 EET 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Dec 23 21:47:03 2016 -0300| [94eb600f354c486fd3a9b50e052e809452673fcf] | committer: James Almer

tests/audio_fifo: fix buffer allocation for non planar formats

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94eb600f354c486fd3a9b50e052e809452673fcf
---

 libavutil/tests/audio_fifo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/tests/audio_fifo.c b/libavutil/tests/audio_fifo.c
index dbadded..34c8573 100644
--- a/libavutil/tests/audio_fifo.c
+++ b/libavutil/tests/audio_fifo.c
@@ -81,11 +81,11 @@ static void print_audio_bytes(const TestStruct *test_sample, void **data_planes,
 
 static int read_samples_from_audio_fifo(AVAudioFifo* afifo, void ***output, int nb_samples)
 {
-    int i, planes;
+    int i;
     int samples        = FFMIN(nb_samples, afifo->nb_samples);
-    int tot_elements   = !(planes = av_sample_fmt_is_planar(afifo->sample_fmt))
+    int tot_elements   = !av_sample_fmt_is_planar(afifo->sample_fmt)
                          ? samples : afifo->channels * samples;
-    void **data_planes = allocate_memory(sizeof(void*) * planes);
+    void **data_planes = allocate_memory(sizeof(void*) * afifo->nb_buffers);
     *output            = data_planes;
 
     for (i = 0; i < afifo->nb_buffers; ++i){



More information about the ffmpeg-cvslog mailing list