[vlc-commits] taglib: do not ignore mpeg ape tags

[Anatoliy Anischovich]

vlc/vlc-2.2 | branch: master | Anatoliy Anischovich <lin.aaa.lin at gmail.com> | Thu Jul 24 12:31:56 2014 +0300| [281d65dab0c142f160eada6ccfdcb3b685becbf0] | committer: Jean-Baptiste Kempf

taglib: do not ignore mpeg ape tags

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit e04e2f10f51b1df801f8309ae5e06a7f5de455d1)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=281d65dab0c142f160eada6ccfdcb3b685becbf0
---

 modules/meta_engine/taglib.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 48d6f5c..f0c382e 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -742,10 +742,10 @@ static int ReadMeta( vlc_object_t* p_this)
     }
     else if( MPEG::File* mpeg = dynamic_cast<MPEG::File*>(f.file()) )
     {
+        if( mpeg->APETag() )
+            ReadMetaFromAPE( mpeg->APETag(), p_demux_meta, p_meta );
         if( mpeg->ID3v2Tag() )
             ReadMetaFromId3v2( mpeg->ID3v2Tag(), p_demux_meta, p_meta );
-        else if( mpeg->APETag() )
-            ReadMetaFromAPE( mpeg->APETag(), p_demux_meta, p_meta );
     }
     else if( dynamic_cast<Ogg::File*>(f.file()) )
     {