ffmpeg | branch: release/2.1 | Michael Niedermayer <michae...@gmx.at> | Mon Oct 6 01:08:20 2014 +0200| [11313263ab37c433286189de4ac51d29d2e5e18e] | committer: Michael Niedermayer
swresample/swresample: fix sample drop loop end condition Fixes Ticket3985 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit f9fefa499f0af48f47ea73c8ce0b25df0976c315) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11313263ab37c433286189de4ac51d29d2e5e18e --- libswresample/swresample.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 30c3434..ec0c770 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -753,6 +753,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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
