From 8c03c7ba9bec0370010cf868feefdfa5f5c6d17d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 26 Feb 2017 20:18:16 +0000 Subject: [PATCH] [WINEMP3.ACM] Sync with Wine Staging 2.2. CORE-12823 ac2b824 winemp3.acm: Fixes compilation for older mpg123 library versions (try 2) 2253d1a winemp3.acm: Ignore XING headers when parsing MP3 files. svn path=/trunk/; revision=73981 --- reactos/dll/win32/winemp3.acm/mpegl3.c | 9 +++++++++ reactos/media/doc/README.WINE | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/reactos/dll/win32/winemp3.acm/mpegl3.c b/reactos/dll/win32/winemp3.acm/mpegl3.c index 5d779a5e10d..3386ae40713 100644 --- a/reactos/dll/win32/winemp3.acm/mpegl3.c +++ b/reactos/dll/win32/winemp3.acm/mpegl3.c @@ -261,6 +261,15 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); + +#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ + /* 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); +#endif } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 32801b716f3..ccd811d41a0 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -198,7 +198,7 @@ reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2 reactos/dll/win32/wbemprox # Synced to WineStaging-2.2 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.9.23 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.9.11 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.9.23 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.2 reactos/dll/win32/wing32 # Synced to WineStaging-1.9.11 reactos/dll/win32/winhttp # Synced to WineStaging-1.9.23 reactos/dll/win32/wininet # Synced to WineStaging-1.9.23