[FFmpeg-cvslog] lavr: do not try to copy to uninitialized output audio data.

Anton Khirnov git at videolan.org
Thu May 10 02:33:20 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed May  9 06:36:29 2012 +0200| [9684341346fd5aad436325529cade47966c4731b] | committer: Anton Khirnov

lavr: do not try to copy to uninitialized output audio data.

This would happen at least when lavr is used as a fifo with no
conversion.

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

 libavresample/utils.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavresample/utils.c b/libavresample/utils.c
index e533760..6d4509d 100644
--- a/libavresample/utils.c
+++ b/libavresample/utils.c
@@ -375,7 +375,8 @@ int avresample_convert(AVAudioResampleContext *avr, void **output,
         }
     }
 
-    return handle_buffered_output(avr, &output_buffer, current_buffer);
+    return handle_buffered_output(avr, output ? &output_buffer : NULL,
+                                  current_buffer);
 }
 
 int avresample_available(AVAudioResampleContext *avr)



More information about the ffmpeg-cvslog mailing list