[FFmpeg-cvslog] swresample/swresample: fix sample drop loop end condition

[Michael Niedermayer]

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 01:08:20 2014 +0200| [65889b62b3ebd1133173becce7dfa27c6462863a] | 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=65889b62b3ebd1133173becce7dfa27c6462863a
---

 libswresample/swresample.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 9b71b2e..464e7b7 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;
         }