vp8/armv6: mc: avoid boolean expression in calculation

[ffmpeg] / libavcodec / aac.h

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index b71e8b607f8de0b39cdaaf5bec297a45a6dc4b6c..fed6bf42145917591687d404bdc3cd4dfbc2ce30 100644 (file)
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -36,7 +36,6 @@
 #include "fft.h"
 #include "mpeg4audio.h"
 #include "sbr.h"
-#include "fmtconvert.h"
 
 #include <stdint.h>
 
@@ -293,7 +292,6 @@ typedef struct AACContext {
     FFTContext mdct_ld;
     FFTContext mdct_ltp;
     IMDCT15Context *mdct480;
-    FmtConvertContext fmt_conv;
     AVFloatDSPContext fdsp;
     int random_state;
     /** @} */