Advertisement
Guest User

Untitled

a guest
Feb 19th, 2017
109
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.90 KB | None | 0 0
  1. diff --git a/configure b/configure
  2. index 255dcdc..e31e6da 100755
  3. --- a/configure
  4. +++ b/configure
  5. @@ -13845,6 +13845,14 @@ else
  6.    MPG123_LIBS=""
  7.  fi
  8.  
  9. +            ac_fn_c_check_type "$LINENO" "MPG123_IGNORE_INFOFRAME" "ac_cv_type_MPG123_IGNORE_INFOFRAME" "#include <mpg123.h>
  10. +"
  11. +if test "x$ac_cv_type_MPG123_IGNORE_INFOFRAME" = xyes; then :
  12. +
  13. +$as_echo "#define HAVE_MPG123_IGNORE_INFOFRAME 1" >>confdefs.h
  14. +
  15. +fi
  16. +
  17.          else
  18.              MPG123_CFLAGS=""
  19.              MPG123_LIBS=""
  20. diff --git a/configure.ac b/configure.ac
  21. index 367851d..67cc7b3 100644
  22. --- a/configure.ac
  23. +++ b/configure.ac
  24. @@ -1643,6 +1643,8 @@ then
  25.          if test "$ac_cv_header_mpg123_h" = "yes"
  26.          then
  27.              AC_CHECK_LIB(mpg123,mpg123_feed,[:],[MPG123_LIBS=""],[$MPG123_LIBS])
  28. +            AC_CHECK_TYPE([MPG123_IGNORE_INFOFRAME],
  29. +                [AC_DEFINE(HAVE_MPG123_IGNORE_INFOFRAME,1,[Define if mpg123 has the MPG123_IGNORE_INFOFRAME enum])],,[[#include <mpg123.h>]])
  30.          else
  31.              MPG123_CFLAGS=""
  32.              MPG123_LIBS=""
  33. diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
  34. index 28a1998..7e6ddff 100644
  35. --- a/dlls/winemp3.acm/mpegl3.c
  36. +++ b/dlls/winemp3.acm/mpegl3.c
  37. @@ -249,12 +249,14 @@ static    LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
  38.          aad->mh = mpg123_new(NULL,&err);
  39.          mpg123_open_feed(aad->mh);
  40.  
  41. +#ifdef HAVE_MPG123_IGNORE_INFOFRAME
  42.          /* mpg123 may find a XING header in the mp3 and use that information
  43.           * to ask for seeks in order to read specific frames in the file.
  44.           * We cannot allow that since the caller application is feeding us.
  45.           * This fixes problems for mp3 files encoded with LAME (bug 42361)
  46.           */
  47.          mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0);
  48. +#endif
  49.      }
  50.      /* no encoding yet
  51.      else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement