[FFmpeg-cvslog] avformat/aadec: Don't use the same loop counter in inner and outer loop

Andreas Rheinhardt git at videolan.org
Wed Jan 12 02:50:10 EET 2022


ffmpeg | branch: release/4.4 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Dec  5 19:27:15 2021 +0100| [ab8830e3489199d71f6349794062040dcb541b8c] | committer: Andreas Rheinhardt

avformat/aadec: Don't use the same loop counter in inner and outer loop

Due to this bush.aa (from the FATE suite) exported garbage metadata
with key "_040930".

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit 0a76f8217e0d80d336ad8d9c46523fd3d1262c8c)

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

 libavformat/aadec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/aadec.c b/libavformat/aadec.c
index 2575e98153..90796c9599 100644
--- a/libavformat/aadec.c
+++ b/libavformat/aadec.c
@@ -130,8 +130,8 @@ static int aa_read_header(AVFormatContext *s)
                 AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE!
             }
             av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is ");
-            for (i = 0; i < 16; i++)
-                av_log(s, AV_LOG_DEBUG, "%02x", header_key[i]);
+            for (int j = 0; j < 16; j++)
+                av_log(s, AV_LOG_DEBUG, "%02x", header_key[j]);
             av_log(s, AV_LOG_DEBUG, "\n");
         } else {
             av_dict_set(&s->metadata, key, val, 0);



More information about the ffmpeg-cvslog mailing list