aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-03-07 21:56:48 +0000
committerMåns Rullgård <mans@mansr.com>2010-03-07 21:56:48 +0000
commit166621ab7217170dad9a90da3236c610c6a3f88d (patch)
tree9528be25d67886be47d1f31a0ac7e4883434a549
parentc70948315b2108d5d082cafe580cb6317edb82be (diff)
downloadffmpeg-166621ab7217170dad9a90da3236c610c6a3f88d.tar.gz
ffplay: use public fft interface
Originally committed as revision 22292 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffplay.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ffplay.c b/ffplay.c
index 25c7b52833..3c9c379dd7 100644
--- 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"
@@ -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(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, 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(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++){