[FFmpeg-devel] [PATCH 4/4] avcodec/acelp_vectors: Add missing brackets

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Fri Aug 6 19:17:25 EEST 2021


Before 3793caa5e2d1d16ed45771574b2ffc932497cfcf the code was
"if (...) do { ... } while (...);". After said commit this became
"if (...) av_assert0(...); do { ... } while (...);", i.e. the loop
is always executed. This commit changes the logic to what it was before
said commit. Notice that the condition is always true in FATE, so no
changes are necessary there.

This fixes a -Wmisleading-indentation warning from GCC 11.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
 libavcodec/acelp_vectors.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/acelp_vectors.c b/libavcodec/acelp_vectors.c
index 0d4de0e4c3..8adea683c1 100644
--- a/libavcodec/acelp_vectors.c
+++ b/libavcodec/acelp_vectors.c
@@ -229,13 +229,14 @@ void ff_set_fixed_vector(float *out, const AMRFixed *in, float scale, int size)
         int x   = in->x[i], repeats = !((in->no_repeat_mask >> i) & 1);
         float y = in->y[i] * scale;
 
-        if (in->pitch_lag > 0)
+        if (in->pitch_lag > 0) {
             av_assert0(x < size);
             do {
                 out[x] += y;
                 y *= in->pitch_fac;
                 x += in->pitch_lag;
             } while (x < size && repeats);
+        }
     }
 }
 
-- 
2.30.2



More information about the ffmpeg-devel mailing list