From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 25 Jun 2021 11:09:14 +0000 (+0200)
Subject: taglib: fix variable shadowing
X-Git-Tag: archive/raspbian/3.0.21-9+rpi1^2~83
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81139b087966a86c2284b221844a360bf019887f;p=vlc.git

taglib: fix variable shadowing

list is already a different local list defined earlier in the function.

(cherry picked from commit 34ca2a286edda76a9718cfa1e50bd3e4ea51702c)

Gbp-Pq: Name 0043-taglib-fix-variable-shadowing.patch
---

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index ced4f56b..a48e102b 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -869,15 +869,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
 
     if( tag->itemListMap().contains("covr") )
     {
-        MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
-        const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+        MP4::CoverArtList cover_list = tag->itemListMap()["covr"].toCoverArtList();
+        const char *psz_format = cover_list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
 
         msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
-                 psz_format, list[0].data().size() );
+                 psz_format, cover_list[0].data().size() );
 
         input_attachment_t *p_attachment =
                 vlc_input_attachment_New( "cover", psz_format, "cover",
-                                          list[0].data().data(), list[0].data().size() );
+                                          cover_list[0].data().data(), cover_list[0].data().size() );
         if( p_attachment )
         {
             TAB_APPEND_CAST( (input_attachment_t**),