vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jun 27 02:02:09 2012 +0200| [0f433ffd9b03d116c51d5f2b743ed0f0bb759ac1] | committer: Jean-Baptiste Kempf
Ogg: do not display x,x if we have both methods for TrackTotal > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0f433ffd9b03d116c51d5f2b743ed0f0bb759ac1 --- modules/demux/vorbis.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/demux/vorbis.h b/modules/demux/vorbis.h index 3f70a9b..3230b8f 100644 --- a/modules/demux/vorbis.h +++ b/modules/demux/vorbis.h @@ -152,8 +152,10 @@ static inline void vorbis_ParseComment( vlc_meta_t **pp_meta, const uint8_t *p_d IF_EXTRACT("TITLE=", Title ) else IF_EXTRACT("ALBUM=", Album ) else IF_EXTRACT("TRACKNUMBER=", TrackNumber ) - else IF_EXTRACT("TRACKTOTAL=", TrackTotal ) - else IF_EXTRACT("TOTALTRACKS=", TrackTotal ) + else if( !hasTrackTotal ) + IF_EXTRACT("TRACKTOTAL=", TrackTotal ) + else if( !hasTrackTotal ) + IF_EXTRACT("TOTALTRACKS=", TrackTotal ) else IF_EXTRACT("ARTIST=", Artist ) else IF_EXTRACT("COPYRIGHT=", Copyright ) else IF_EXTRACT("ORGANIZATION=", Publisher ) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
