[FFmpeg-cvslog] avfilter/vf_fftfilt: Add MAX_PLANES and change it to 4
Michael Niedermayer
git at videolan.org
Tue May 12 20:38:59 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 12 20:08:18 2015 +0200| [1431b4cf77d62596e9fa0b8224e7f38e20b55f24] | committer: Michael Niedermayer
avfilter/vf_fftfilt: Add MAX_PLANES and change it to 4
The 4th planes is currently unused as no formats with alpha are supported yet
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1431b4cf77d62596e9fa0b8224e7f38e20b55f24
---
libavfilter/vf_fftfilt.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/libavfilter/vf_fftfilt.c b/libavfilter/vf_fftfilt.c
index dd522fa..c914ed0 100644
--- a/libavfilter/vf_fftfilt.c
+++ b/libavfilter/vf_fftfilt.c
@@ -31,21 +31,23 @@
#include "libavcodec/avfft.h"
#include "libavutil/eval.h"
+#define MAX_PLANES 4
+
typedef struct {
const AVClass *class;
RDFTContext *rdft;
- int rdft_hbits[3];
- int rdft_vbits[3];
- size_t rdft_hlen[3];
- size_t rdft_vlen[3];
- FFTSample *rdft_hdata[3];
- FFTSample *rdft_vdata[3];
-
- int dc[3];
- char *weight_str[3];
- AVExpr *weight_expr[3];
- double *weight[3];
+ int rdft_hbits[MAX_PLANES];
+ int rdft_vbits[MAX_PLANES];
+ size_t rdft_hlen[MAX_PLANES];
+ size_t rdft_vlen[MAX_PLANES];
+ FFTSample *rdft_hdata[MAX_PLANES];
+ FFTSample *rdft_vdata[MAX_PLANES];
+
+ int dc[MAX_PLANES];
+ char *weight_str[MAX_PLANES];
+ AVExpr *weight_expr[MAX_PLANES];
+ double *weight[MAX_PLANES];
} FFTFILTContext;
@@ -291,7 +293,7 @@ static av_cold void uninit(AVFilterContext *ctx)
{
FFTFILTContext *fftfilt = ctx->priv;
int i;
- for (i = 0; i < 3; i++) {
+ for (i = 0; i < MAX_PLANES; i++) {
av_free(fftfilt->rdft_hdata[i]);
av_free(fftfilt->rdft_vdata[i]);
av_expr_free(fftfilt->weight_expr[i]);
More information about the ffmpeg-cvslog
mailing list