taglib: .m4v are already registered as MP4 files

https://github.com/taglib/taglib/pull/662
(cherry picked from commit 84962e474bfefa242527f7c3ddffe6ed4f697fbe) (rebased)

Gbp-Pq: Name 0032-taglib-.m4v-are-already-registered-as-MP4-files.patch

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 84b401c795a9c81ef4aa9396358faef537b23480..73bc5d8d905bc4b422dc9b4d0b3db4e9749fbfe5 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -142,7 +142,6 @@ File *VLCTagLib::ExtResolver<T>::createFile(FileName fileName, bool, AudioProper
 #if TAGLIB_VERSION >= TAGLIB_VERSION_1_11
 static VLCTagLib::ExtResolver<MPEG::File> aacresolver(".aac");
 #endif
-static VLCTagLib::ExtResolver<MP4::File> m4vresolver(".m4v");
 static bool b_extensions_registered = false;
 
 // taglib is not thread safe
@@ -911,7 +910,6 @@ static int ReadMeta( vlc_object_t* p_this)
 #if TAGLIB_VERSION >= TAGLIB_VERSION_1_11
         FileRef::addFileTypeResolver( &aacresolver );
 #endif
-        FileRef::addFileTypeResolver( &m4vresolver );
         b_extensions_registered = true;
     }