summaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-26 02:33:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-26 02:33:38 +0200
commit72261fa8675ca6e118efe202fcb13fd0866d4a54 (patch)
tree03719a9a4e9874d4a8c6a70c2284e171ffbb0e21 /libswresample
parent411689b5e1189e325f12060e52e7c5cb29f87b21 (diff)
downloadffmpeg-streaming-72261fa8675ca6e118efe202fcb13fd0866d4a54.zip
ffmpeg-streaming-72261fa8675ca6e118efe202fcb13fd0866d4a54.tar.gz
swr: fix swr_drop_output()
Fixes part of Ticket1341 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
-rw-r--r--libswresample/swresample.c1
1 files changed, 1 insertions, 0 deletions
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){
OpenPOWER on IntegriCloud