]> git.sesse.net Git - ffmpeg/commitdiff
swr: Fix partial flushing.
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Mar 2012 03:58:31 +0000 (05:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 25 Mar 2012 04:37:01 +0000 (06:37 +0200)
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswresample/swresample.c

index 5ce377fd6ff4204e20a35658186c687a7c2b6e14..1a384aab13c3c6cc6150920bca0df26723e7e5ca 100644 (file)
@@ -160,6 +160,8 @@ int swr_init(struct SwrContext *s){
     swri_audio_convert_free(&s->out_convert);
     swri_audio_convert_free(&s->full_convert);
 
+    s->flushed = 0;
+
     s-> in.planar= av_sample_fmt_is_planar(s-> in_sample_fmt);
     s->out.planar= av_sample_fmt_is_planar(s->out_sample_fmt);
     s-> in_sample_fmt= av_get_alt_sample_fmt(s-> in_sample_fmt, 0);
@@ -529,8 +531,6 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
 //FIXME packed doesnt need more than 1 chan here!
         swri_audio_convert(s->out_convert, out, preout, out_count);
     }
-    if(!in_arg)
-        s->in_buffer_count = 0;
     return out_count;
 }