OSDN Git Service

Silence warning "new qualifiers in middle of multi-level
authorEli Friedman <eli.friedman@gmail.com>
Wed, 7 Jul 2010 10:24:34 +0000 (10:24 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Wed, 7 Jul 2010 10:24:34 +0000 (10:24 +0000)
non-const cast are unsafe".

Patch by Eli Friedman, eli d friedman a gmail

Originally committed as revision 24080 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/wmadec.c

index a24256d..5582a72 100644 (file)
@@ -804,10 +804,10 @@ static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
                     s->frame_len * sizeof(float));
         }
     } else {
-        float *output[MAX_CHANNELS];
+        const float *output[MAX_CHANNELS];
         for (ch = 0; ch < MAX_CHANNELS; ch++)
             output[ch] = s->frame_out[ch];
-        s->dsp.float_to_int16_interleave(samples, (const float **)output, n, incr);
+        s->dsp.float_to_int16_interleave(samples, output, n, incr);
         for(ch = 0; ch < incr; ch++) {
             /* prepare for next block */
             memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));