summaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-25 11:48:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-03-25 12:22:06 +0200
commite0c71283023163dc6431f000cdb5a661b05beae0 (patch)
tree2d650b73b32719df32216719aefc25fb6b47b60a /libswresample
parent691b92474a1270333636202a867fa23025f76735 (diff)
downloadffmpeg-streaming-e0c71283023163dc6431f000cdb5a661b05beae0.zip
ffmpeg-streaming-e0c71283023163dc6431f000cdb5a661b05beae0.tar.gz
swr: fix segfault when 0 out size is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample.c2
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);
}
OpenPOWER on IntegriCloud