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:31:39 +0200 |
| commit | 65889b62b3ebd1133173becce7dfa27c6462863a (patch) | |
| tree | 056facfb9be2abd86992448e43982ed3c523c7cd | |
| parent | 7fc97160c27d358e8489fefccde10a89f7c9e310 (diff) | |
| download | ffmpeg-65889b62b3ebd1133173becce7dfa27c6462863a.tar.gz | |
swresample/swresample: fix sample drop loop end condition
Fixes Ticket3985
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f9fefa499f0af48f47ea73c8ce0b25df0976c315)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 9b71b2e122..464e7b7e04 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -751,6 +751,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; } |