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:18 +0200 |
| commit | a28c276b8dccb36acd1f3d5a956a581862254c1f (patch) | |
| tree | 01bf8f9bcd7c3638bda027c1ecaeb0efad459ff7 | |
| parent | 26da47a09be8a329430b1125b44f7c0c2f2a0868 (diff) | |
| download | ffmpeg-a28c276b8dccb36acd1f3d5a956a581862254c1f.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 54e06e1d00..6818f2b90e 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -761,6 +761,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; } |