sh4: move dsputil prototypes to header file

[ffmpeg] / ffplay.c

diff --git a/ffplay.c b/ffplay.c
index 89b58fc11c94b5185dd05d512bfc2db0ceaf8e18..bfe10bebd154864a45be3ff74d5c0bb5dffea7fb 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -30,7 +30,7 @@
 #include "libavcodec/audioconvert.h"
 #include "libavcodec/colorspace.h"
 #include "libavcodec/opt.h"
-#include "libavcodec/fft.h"
+#include "libavcodec/avfft.h"
 
 #if CONFIG_AVFILTER
 # include "libavfilter/avfilter.h"
@@ -47,10 +47,6 @@
 #undef main /* We don't want SDL to override our main() */
 #endif
 
-#undef exit
-#undef printf
-#undef fprintf
-
 const char program_name[] = "FFplay";
 const int program_birth_year = 2003;
 
@@ -165,7 +161,7 @@ typedef struct VideoState {
     int16_t sample_array[SAMPLE_ARRAY_SIZE];
     int sample_array_index;
     int last_i_start;
-    RDFTContext rdft;
+    RDFTContext *rdft;
     int rdft_bits;
     int xpos;
 
@@ -905,8 +901,8 @@ static void video_audio_display(VideoState *s)
     }else{
         nb_display_channels= FFMIN(nb_display_channels, 2);
         if(rdft_bits != s->rdft_bits){
-            ff_rdft_end(&s->rdft);
-            ff_rdft_init(&s->rdft, rdft_bits, RDFT);
+            av_rdft_end(s->rdft);
+            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
             s->rdft_bits= rdft_bits;
         }
         {
@@ -920,7 +916,7 @@ static void video_audio_display(VideoState *s)
                     if (i >= SAMPLE_ARRAY_SIZE)
                         i -= SAMPLE_ARRAY_SIZE;
                 }
-                ff_rdft_calc(&s->rdft, data[ch]);
+                av_rdft_calc(s->rdft, data[ch]);
             }
             //least efficient way to do this, we should of course directly access it but its more than fast enough
             for(y=0; y<s->height; y++){