[FFmpeg-cvslog] swresample/swresample: fix sample drop loop end condition
Michael Niedermayer
git at videolan.org
Sat Nov 1 13:35:29 CET 2014
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 6 01:08:20 2014 +0200| [81b38caf21fc7e568ec0a874b9921c3c75cd460c] | committer: Michael Niedermayer
swresample/swresample: fix sample drop loop end condition
Fixes Ticket3985
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit f9fefa499f0af48f47ea73c8ce0b25df0976c315)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81b38caf21fc7e568ec0a874b9921c3c75cd460c
---
libswresample/swresample.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 32bbee3..c325513 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;
}
More information about the ffmpeg-cvslog
mailing list