diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 01:08:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 01:29:06 +0200 |
| commit | f9fefa499f0af48f47ea73c8ce0b25df0976c315 (patch) | |
| tree | e50f242cb42710247bf9b651bf123d9521df9dee /libswresample/swresample.c | |
| parent | 02f7665a3ce703217ae1cbbc7baa29c438d61456 (diff) | |
| download | ffmpeg-f9fefa499f0af48f47ea73c8ce0b25df0976c315.tar.gz | |
swresample/swresample: fix sample drop loop end condition
Fixes Ticket3985
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
| -rw-r--r-- | libswresample/swresample.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 32bbee3340..c325513efa 100644 --- 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; } |