swr: dont treat 32 and 24 as equal in simple copy check
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 00:49:00 +0000 (02:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 01:06:34 +0000 (03:06 +0200)
Fixes dithering from 32 to 24 bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswresample/swresample.c

index 012de02..08b1aad 100644 (file)
@@ -651,7 +651,8 @@ static int swr_convert_internal(struct SwrContext *s, AudioData *out, int out_co
     if(s->resample_first ? !s->rematrix : !s->resample)
         preout= midbuf;
 
-    if(s->int_sample_fmt == s->out_sample_fmt && s->out.planar){
+    if(s->int_sample_fmt == s->out_sample_fmt && s->out.planar
+       && !(s->out_sample_fmt==AV_SAMPLE_FMT_S32P && (s->dither.output_sample_bits&31))){
         if(preout==in){
             out_count= FFMIN(out_count, in_count); //TODO check at the end if this is needed or redundant
             av_assert0(s->in.planar); //we only support planar internally so it has to be, we support copying non planar though