Bruno Jesus : winemp3.acm: Fixes compilation for older mpg123 library versions.
Alexandre Julliard
julliard at winehq.org
Thu Apr 20 12:35:11 CDT 2017
Module: wine
Branch: stable
Commit: 54c22b0864abaf8bb379c827614f0d9f4646e2e5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c22b0864abaf8bb379c827614f0d9f4646e2e5
Author: Bruno Jesus <00cpxxx at gmail.com>
Date: Sun Feb 19 22:16:18 2017 -0300
winemp3.acm: Fixes compilation for older mpg123 library versions.
Thanks to Sebastian Lackner for the correct approach.
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>
(cherry picked from commit bb036ae502f7012af17a4a5eefcb43e294ab502f)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/winemp3.acm/mpegl3.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
index 28a1998..cc6008d 100644
--- a/dlls/winemp3.acm/mpegl3.c
+++ b/dlls/winemp3.acm/mpegl3.c
@@ -249,12 +249,14 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
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 &&
More information about the wine-cvs
mailing list