Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'

[ffmpeg] / libavfilter / avf_showspectrum.c

diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index 24116dacf8b9caed716b4edd833f468e2278e164..49491b6646102474490017c0350a691f6335d4f8 100644 (file)
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@@ -48,16 +48,16 @@ typedef struct {
     int nb_display_channels;
     int channel_height;
     int sliding;                ///< 1 if sliding mode, 0 otherwise
-    enum DisplayMode mode;      ///< channel display mode
-    enum ColorMode color_mode;  ///< display color scheme
-    enum DisplayScale scale;
+    int mode;                   ///< channel display mode
+    int color_mode;             ///< display color scheme
+    int scale;
     float saturation;           ///< color saturation multiplier
     int xpos;                   ///< x position (current column)
     RDFTContext *rdft;          ///< Real Discrete Fourier Transform context
     int rdft_bits;              ///< number of bits (RDFT window size = 1<<rdft_bits)
     FFTSample **rdft_data;      ///< bins holder for each (displayed) channels
     float *window_func_lut;     ///< Window function LUT
-    enum WindowFunc win_func;
+    int win_func;
     float *combine_buffer;      ///< color combining buffer (3 * h items)
 } ShowSpectrumContext;