This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 9c0f94229378831364bd1c62a15207219463073c
Author:     Andreas Rheinhardt <[email protected]>
AuthorDate: Sat Feb 21 15:38:32 2026 +0100
Commit:     Andreas Rheinhardt <[email protected]>
CommitDate: Tue Mar 10 13:52:18 2026 +0100

    avformat/aviobuf: Fix shadowing
    
    Signed-off-by: Andreas Rheinhardt <[email protected]>
---
 libavformat/aviobuf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 373a48eea5..cc71638f0c 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -392,10 +392,10 @@ static inline int put_str16(AVIOContext *s, const char 
*str, const int be)
 
     while (*q) {
         uint32_t ch;
-        uint16_t tmp;
+        uint16_t tmp16;
 
         GET_UTF8(ch, *q++, goto invalid;)
-        PUT_UTF16(ch, tmp, be ? avio_wb16(s, tmp) : avio_wl16(s, tmp);
+        PUT_UTF16(ch, tmp16, be ? avio_wb16(s, tmp16) : avio_wl16(s, tmp16);
                   ret += 2;)
         continue;
 invalid:

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to