ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/dct.c

 /*
  * (I)DCT Transforms
  * Copyright (c) 2009 Peter Ross <pross@xvid.org>
  * Copyright (c) 2010 Alex Converse <alex.converse@gmail.com>
  * Copyright (c) 2010 Vitor Sessak
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 10 matching lines @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /**
  * @file libavcodec/dct.c
  * (Inverse) Discrete Cosine Transforms. These are also known as the
  * type II and type III DCTs respectively.
  */
 
 #include <math.h>
-#include "dsputil.h"
+#include "libavutil/mathematics.h"
+#include "fft.h"
 
 av_cold int ff_dct_init(DCTContext *s, int nbits, int inverse)
 {
     int n = 1 << nbits;
     int i;
 
     s->nbits    = nbits;
     s->inverse  = inverse;
 
     ff_init_ff_cos_tabs(nbits+2);
@@ skipping 88 matching lines @@
 void ff_dct_calc(DCTContext *s, FFTSample *data)
 {
     ff_dct_calc_c(s, data);
 }
 
 av_cold void ff_dct_end(DCTContext *s)
 {
     ff_rdft_end(&s->rdft);
     av_free(s->csc2);
 }