diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 01:08:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-02 02:20:09 +0100 |
| commit | 322470e606334bdbda7993a44acc1955fb00fdec (patch) | |
| tree | 227cbe0796d654f925953cb25da7f21aa7596893 /libswresample | |
| parent | 0e7173826216384b56192be3ccdbccb488d7c977 (diff) | |
| download | ffmpeg-322470e606334bdbda7993a44acc1955fb00fdec.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>
Diffstat (limited to 'libswresample')
| -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 ba2afdb1d0..c534ccf0dc 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -752,6 +752,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; } |