Imported Debian version 2.5.1~trusty

[deb_ffmpeg.git] / ffmpeg / libswresample / soxr_resample.c

diff --git a/ffmpeg/libswresample/soxr_resample.c b/ffmpeg/libswresample/soxr_resample.c
index 064451df452ef3dcde38eb97e44db3f931dc5b93..9e87f2fc4b69cdfbe034a2a332dec23881799885 100644 (file)
--- a/ffmpeg/libswresample/soxr_resample.c
+++ b/ffmpeg/libswresample/soxr_resample.c
@@ -76,8 +76,12 @@ static int process(
         AudioData *src, int src_size, int *consumed){
     size_t idone, odone;
     soxr_error_t error = soxr_set_error((soxr_t)c, soxr_set_num_channels((soxr_t)c, src->ch_count));
-    error = soxr_process((soxr_t)c, src->ch, (size_t)src_size,
-            &idone, dst->ch, (size_t)dst_size, &odone);
+    if (!error)
+        error = soxr_process((soxr_t)c, src->ch, (size_t)src_size,
+                             &idone, dst->ch, (size_t)dst_size, &odone);
+    else
+        idone = 0;
+
     *consumed = (int)idone;
     return error? -1 : odone;
 }