[FFmpeg-cvslog] avcodec/opusenc_psy: Fix warning: ISO C90 forbids mixed declarations and code

Michael Niedermayer git at videolan.org
Fri Apr 20 03:22:28 EEST 2018


ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Thu Apr 19 23:28:26 2018 +0200| [bc2ceeb3ac346ada448f3c9b89b4aecb084571f5] | committer: Michael Niedermayer

avcodec/opusenc_psy: Fix warning: ISO C90 forbids mixed declarations and code

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit f8b17fe33233237eea304d4fb0636539a131c1b2)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc2ceeb3ac346ada448f3c9b89b4aecb084571f5
---

 libavcodec/opusenc_psy.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/opusenc_psy.c b/libavcodec/opusenc_psy.c
index 8aded2140d..5a50db942f 100644
--- a/libavcodec/opusenc_psy.c
+++ b/libavcodec/opusenc_psy.c
@@ -399,13 +399,12 @@ static void celt_search_for_intensity(OpusPsyContext *s, CeltFrame *f)
 {
     int i, best_band = CELT_MAX_BANDS - 1;
     float dist, best_dist = FLT_MAX;
+    /* TODO: fix, make some heuristic up here using the lambda value */
+    float end_band = 0;
 
     if (s->avctx->channels < 2)
         return;
 
-    /* TODO: fix, make some heuristic up here using the lambda value */
-    float end_band = 0;
-
     for (i = f->end_band; i >= end_band; i--) {
         f->intensity_stereo = i;
         bands_dist(s, f, &dist);



More information about the ffmpeg-cvslog mailing list