Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:09:46 +01:00
parent 849f80fecb cf752d027f
commit d4a50a2100
44 changed files with 458 additions and 275 deletions
--- a/libavcodec/synth_filter.c
+++ b/libavcodec/synth_filter.c
@@ -29,7 +29,7 @@ static void synth_filter_float(FFTContext *imdct,
    float *synth_buf= synth_buf_ptr + *synth_buf_offset;
    int i, j;

-    ff_imdct_half(imdct, synth_buf, in);
+    imdct->imdct_half(imdct, synth_buf, in);

    for (i = 0; i < 16; i++){
        float a= synth_buf2[i     ];