diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 02:33:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-26 02:59:22 +0200 |
| commit | 072e7fad8733b7462f74de707b1cf5d06f85aa31 (patch) | |
| tree | 9f10414566292419fc980d9a36f40c1a5f005d2a | |
| parent | 484302d183877bf0dbba616d5e3d3526be00653d (diff) | |
| download | ffmpeg-072e7fad8733b7462f74de707b1cf5d06f85aa31.tar.gz | |
swr: fix swr_drop_output()
Fixes part of Ticket1341
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 72261fa8675ca6e118efe202fcb13fd0866d4a54)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/swresample.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index a0560a19da..27f3581d5f 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){ |