Bruno Jesus : winemp3.acm: Ignore XING headers when parsing MP3 files.

Alexandre Julliard julliard at winehq.org
Thu Feb 9 15:54:27 CST 2017


Module: wine
Branch: master
Commit: 2253d1a9d3a36bc3dcdc05acc8bf47085b739c6f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2253d1a9d3a36bc3dcdc05acc8bf47085b739c6f

Author: Bruno Jesus <00cpxxx at gmail.com>
Date:   Tue Feb  7 13:55:53 2017 -0200

winemp3.acm: Ignore XING headers when parsing MP3 files.

Signed-off-by: Bruno Jesus <00cpxxx at gmail.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemp3.acm/mpegl3.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
index 37993b4..28a1998 100644
--- a/dlls/winemp3.acm/mpegl3.c
+++ b/dlls/winemp3.acm/mpegl3.c
@@ -248,6 +248,13 @@ static	LRESULT	MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
         aad->convert = mp3_horse;
         aad->mh = mpg123_new(NULL,&err);
         mpg123_open_feed(aad->mh);
+
+        /* mpg123 may find a XING header in the mp3 and use that information
+         * to ask for seeks in order to read specific frames in the file.
+         * We cannot allow that since the caller application is feeding us.
+         * This fixes problems for mp3 files encoded with LAME (bug 42361)
+         */
+        mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0);
     }
     /* no encoding yet
     else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&




More information about the wine-cvs mailing list