Silence some ICC warnings. Patch by Vitor Sessak.

[ffmpeg] / libavcodec / wmadec.c

diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 4d892ceac65eb3182f815e43d835e10a44b2ba71..fbd945db5465f5e6d89c4dfedb0b3e89a64354fa 100644 (file)
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -126,6 +126,7 @@ static int wma_decode_init(AVCodecContext * avctx)
         wma_lsp_to_curve_init(s, s->frame_len);
     }
 
+    avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
 }
 
@@ -687,20 +688,13 @@ next:
         n = s->block_len;
         n4 = s->block_len / 2;
         if(s->channel_coded[ch]){
-            s->mdct_ctx[bsize].fft.imdct_calc(&s->mdct_ctx[bsize],
-                                              s->output, s->coefs[ch], s->mdct_tmp);
-        }else
+            ff_imdct_calc(&s->mdct_ctx[bsize], s->output, s->coefs[ch]);
+        }else if(!(s->ms_stereo && ch==1))
             memset(s->output, 0, sizeof(s->output));
 
         /* multiply by the window and add in the frame */
         index = (s->frame_len / 2) + s->block_pos - n4;
         wma_window(s, &s->frame_out[ch][index]);
-
-        /* specific fast case for ms-stereo : add to second
-            channel if it is not coded */
-        if (s->ms_stereo && !s->channel_coded[1]) {
-            wma_window(s, &s->frame_out[1][index]);
-        }
     }
 
     /* update block number */