[FFmpeg-cvslog] r22292 - trunk/ffplay.c

[mru]

Author: mru
Date: Sun Mar  7 22:56:48 2010
New Revision: 22292

Log:
ffplay: use public fft interface

Modified:
   trunk/ffplay.c

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Mar  7 22:56:45 2010	(r22291)
+++ trunk/ffplay.c	Sun Mar  7 22:56:48 2010	(r22292)
@@ -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"
@@ -165,7 +165,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 +905,8 @@ static void video_audio_display(VideoSta
     }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, DFT_R2C);
+            av_rdft_end(s->rdft);
+            s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
             s->rdft_bits= rdft_bits;
         }
         {
@@ -920,7 +920,7 @@ static void video_audio_display(VideoSta
                     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++){