Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/configure b/configure
- index 255dcdc..e31e6da 100755
- --- a/configure
- +++ b/configure
- @@ -13845,6 +13845,14 @@ else
- MPG123_LIBS=""
- fi
- + ac_fn_c_check_type "$LINENO" "MPG123_IGNORE_INFOFRAME" "ac_cv_type_MPG123_IGNORE_INFOFRAME" "#include <mpg123.h>
- +"
- +if test "x$ac_cv_type_MPG123_IGNORE_INFOFRAME" = xyes; then :
- +
- +$as_echo "#define HAVE_MPG123_IGNORE_INFOFRAME 1" >>confdefs.h
- +
- +fi
- +
- else
- MPG123_CFLAGS=""
- MPG123_LIBS=""
- diff --git a/configure.ac b/configure.ac
- index 367851d..67cc7b3 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -1643,6 +1643,8 @@ then
- if test "$ac_cv_header_mpg123_h" = "yes"
- then
- AC_CHECK_LIB(mpg123,mpg123_feed,[:],[MPG123_LIBS=""],[$MPG123_LIBS])
- + AC_CHECK_TYPE([MPG123_IGNORE_INFOFRAME],
- + [AC_DEFINE(HAVE_MPG123_IGNORE_INFOFRAME,1,[Define if mpg123 has the MPG123_IGNORE_INFOFRAME enum])],,[[#include <mpg123.h>]])
- else
- MPG123_CFLAGS=""
- MPG123_LIBS=""
- diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
- index 28a1998..7e6ddff 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);
- +#ifdef HAVE_MPG123_IGNORE_INFOFRAME
- /* 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 &&
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement