[akhaldi] 73981: [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 ...

Author: akhaldi
Date: Sun Feb 26 20:18:16 2017
New Revision: 73981

URL: http://svn.reactos.org/svn/reactos?rev=73981&view=rev
Log:
[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.

Modified:
    trunk/reactos/dll/win32/winemp3.acm/mpegl3.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/winemp3.acm/mpegl3.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/mpegl...
==============================================================================
--- trunk/reactos/dll/win32/winemp3.acm/mpegl3.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/winemp3.acm/mpegl3.c	[iso-8859-1] Sun Feb 26 20:18:16 2017
@@ -261,6 +261,15 @@
         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 &&

Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7...
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Feb 26 20:18:16 2017
@@ -198,7 +198,7 @@
 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