Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

2 files changed, 4 insertions, 4 deletions

diff --git a/src/track/taglib/trackmetadata_id3v2.cpp b/src/track/taglib/trackmetadata_id3v2.cpp
index 13df0e1477..5bc4e2de36 100644
--- a/src/track/taglib/trackmetadata_id3v2.cpp
+++ b/src/track/taglib/trackmetadata_id3v2.cpp
@@ -46,12 +46,12 @@ bool checkHeaderVersionSupported(
 }
 
 // Preferred picture types for cover art sorted by priority
-const std::array<TagLib::ID3v2::AttachedPictureFrame::Type, 4> kPreferredPictureTypes = {
+const std::array<TagLib::ID3v2::AttachedPictureFrame::Type, 4> kPreferredPictureTypes{{
         TagLib::ID3v2::AttachedPictureFrame::FrontCover,   // Front cover image of the album
         TagLib::ID3v2::AttachedPictureFrame::Media,        // Image from the album itself
         TagLib::ID3v2::AttachedPictureFrame::Illustration, // Illustration related to the track
         TagLib::ID3v2::AttachedPictureFrame::Other,
-};
+}};
 
 // http://id3.org/id3v2.3.0
 // "TYER: The 'Year' frame is a numeric string with a year of the
diff --git a/src/track/taglib/trackmetadata_xiph.cpp b/src/track/taglib/trackmetadata_xiph.cpp
index 507e4d9408..05ca98ebdf 100644
--- a/src/track/taglib/trackmetadata_xiph.cpp
+++ b/src/track/taglib/trackmetadata_xiph.cpp
@@ -24,12 +24,12 @@ namespace taglib {
 namespace {
 
 // Preferred picture types for cover art sorted by priority
-const std::array<TagLib::FLAC::Picture::Type, 4> kPreferredPictureTypes = {
+const std::array<TagLib::FLAC::Picture::Type, 4> kPreferredPictureTypes{{
         TagLib::FLAC::Picture::FrontCover,   // Front cover image of the album
         TagLib::FLAC::Picture::Media,        // Image from the album itself
         TagLib::FLAC::Picture::Illustration, // Illustration related to the track
         TagLib::FLAC::Picture::Other,
-};
+}};
 
 const TagLib::String kCommentFieldKeySeratoMarkers2FLAC = "SERATO_MARKERS_V2";
 const TagLib::String kCommentFieldKeySeratoMarkers2Ogg = "SERATO_MARKERS2";