avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

[ffmpeg] / libavcodec / aacenc.c

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 998a87517f6512c539cc71e0c0c497d0ccc5c1b4..897c3a10df225620a236844d9f94ec6b6991c6f8 100644 (file)
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -733,9 +733,9 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
     ff_init_ff_sine_windows(10);
     ff_init_ff_sine_windows(7);
 
-    if (ret = ff_mdct_init(&s->mdct1024, 11, 0, 32768.0))
+    if ((ret = ff_mdct_init(&s->mdct1024, 11, 0, 32768.0)) < 0)
         return ret;
-    if (ret = ff_mdct_init(&s->mdct128,   8, 0, 32768.0))
+    if ((ret = ff_mdct_init(&s->mdct128,   8, 0, 32768.0)) < 0)
         return ret;
 
     return 0;