[FFmpeg-cvslog] swr: fix swr_drop_output()
Michael Niedermayer
git at videolan.org
Sat May 26 13:06:44 CEST 2012
ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Sat May 26 02:33:38 2012 +0200| [072e7fad8733b7462f74de707b1cf5d06f85aa31] | committer: Michael Niedermayer
swr: fix swr_drop_output()
Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 72261fa8675ca6e118efe202fcb13fd0866d4a54)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=072e7fad8733b7462f74de707b1cf5d06f85aa31
---
libswresample/swresample.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index a0560a1..27f3581 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -629,6 +629,7 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
av_freep(&tmp.data);
if(s->drop_output || !out_arg)
return 0;
+ in_count = 0;
}
if(!in_arg){
More information about the ffmpeg-cvslog
mailing list