Updated FFmpeg

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1792 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 10 insertions, 1 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c
index 150a59aeb..db7cf5816 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/fft.c
@@ -26,7 +26,10 @@
  * FFT/IFFT transforms.

  */

 

-#include "dsputil.h"

+#include <stdlib.h>

+#include <string.h>

+#include "libavutil/mathematics.h"

+#include "fft.h"

 

 /* cos(2*pi*x/n) for 0<=x<=n/4, followed by its reverse */

 #if !CONFIG_HARDCODED_TABLES

@@ -99,12 +102,18 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse)
 

     s->fft_permute = ff_fft_permute_c;

     s->fft_calc    = ff_fft_calc_c;

+#if CONFIG_MDCT

     s->imdct_calc  = ff_imdct_calc_c;

     s->imdct_half  = ff_imdct_half_c;

     s->mdct_calc   = ff_mdct_calc_c;

+#endif

     s->exptab1     = NULL;

     s->split_radix = 1;

 

+    #if HAVE_MMX && HAVE_YASM && ARCH_X86_32

+    ff_fft_init_mmx(s);

+    #endif

+	

     if (s->split_radix) {

         for(j=4; j<=nbits; j++) {

             ff_init_ff_cos_tabs(j);