[vlc-commits] Skip all id3tag in the demuxer, not just the first one.

[Luc Saillard]

vlc/vlc-1.1 | branch: master | Luc Saillard <luc.saillard at sfr.com> | Mon Jul 18 10:29:19 2011 +0200| [671876a521f169c68e3ba743116f6c14d2acf8fc] | committer: Rémi Denis-Courmont

Skip all id3tag in the demuxer, not just the first one.

Some audio file can contains severall id3tag. Apple use it to insert a
jpeg in an audio only stream to display an image. So just iterate others
all id3tag, and discard them.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit ab6aece328aa884cdfde44b0081d3d252db325e1)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=671876a521f169c68e3ba743116f6c14d2acf8fc
---

 src/input/demux.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index 981799f..ab01a13 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -162,8 +162,9 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
         /* ID3/APE tags will mess-up demuxer probing so we skip it here.
          * ID3/APE parsers will called later on in the demuxer to access the
          * skipped info. */
-        if( !SkipID3Tag( p_demux ) )
-            SkipAPETag( p_demux );
+        while (SkipID3Tag( p_demux ))
+          ;
+        SkipAPETag( p_demux );
 
         p_demux->p_module =
             module_need( p_demux, "demux", psz_module,