swresample/swresample: fix sample drop loop end condition

Fixes Ticket3985 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06 01:08:20 +02:00 · 2014-10-06 01:08:20 +02:00 · f9fefa499f
parent 02f7665a3c
commit f9fefa499f
1 changed files with 2 additions and 0 deletions
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@ -663,6 +663,8 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
        in_count = 0;
        if(ret>0) {
            s->drop_output -= ret;
+            if (!s->drop_output && !out_arg)
+                return 0;
            continue;
        }