[FFmpeg-cvslog] swr: fix segfault when 0 out size is used.

Michael Niedermayer git at videolan.org
Sun Mar 25 12:25:55 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 25 11:48:09 2012 +0200| [e0c71283023163dc6431f000cdb5a661b05beae0] | committer: Michael Niedermayer

swr: fix segfault when 0 out size is used.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libswresample/swresample.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 1a384aa..eb83aa2 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -527,7 +527,7 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
             out_count= resample(s, preout, out_count, midbuf, in_count);
     }
 
-    if(preout != out){
+    if(preout != out && out_count){
 //FIXME packed doesnt need more than 1 chan here!
         swri_audio_convert(s->out_convert, out, preout, out_count);
     }



More information about the ffmpeg-cvslog mailing list