sonic: replace some float by integers to improve platform independance
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Jun 2013 19:58:13 +0000 (21:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Jun 2013 19:58:13 +0000 (21:58 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sonic.c

index 58bba88..7736a12 100644 (file)
@@ -550,7 +550,7 @@ static av_cold int sonic_encode_init(AVCodecContext *avctx)
     s->channels = avctx->channels;
     s->samplerate = avctx->sample_rate;
 
-    s->block_align = (int)(2048.0*s->samplerate/44100)/s->downsampling;
+    s->block_align = 2048LL*s->samplerate/(44100*s->downsampling);
     s->frame_size = s->channels*s->block_align*s->downsampling;
 
     s->tail_size = s->num_taps*s->channels;
@@ -813,7 +813,7 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
     if (get_bits1(&gb)) // XXX FIXME
         av_log(avctx, AV_LOG_INFO, "Custom quant table\n");
 
-    s->block_align = (int)(2048.0*s->samplerate/44100)/s->downsampling;
+    s->block_align = 2048LL*s->samplerate/(44100*s->downsampling);
     s->frame_size = s->channels*s->block_align*s->downsampling;
 //    avctx->frame_size = s->block_align;