preparation for rc4a

quick fix for wma static noise.
(a more general solution should be employed in configure.ac)

CVS patchset: 6520
CVS date: 2004/05/11 21:31:55

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f023cbf9..de11340e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,8 @@ xine-lib (1-rc4a)
     circunstances, parts of the images were not shown.
   * enable colorkey overlays for more cards using XVideo and vidix drivers.
   * make it possible for the CDDA plugin to give away Musicbrainz CD Index ID
-  * several DVB improvements. add dvbs://, dvbc:// and dvbt:// mrls 
+  * several DVB improvements. add dvbs://, dvbc:// and dvbt:// mrls
+  * fix static noise produced by WMA streams in some systems
 
 xine-lib (1-rc4)
   * experimental DTS software decoder using libdts
diff --git a/configure.ac b/configure.ac
index 3b321fc99..f62b8988f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ dnl for a release tarball do "rm .cvsversion" before "make dist"
 if test -f .cvsversion; then
   XINE_PRE="cvs"
 else
-  XINE_PRE="rc4"
+  XINE_PRE="rc4a"
 fi
 
 AC_SUBST(XINE_MAJOR)
diff --git a/src/libffmpeg/libavcodec/wmadec.c b/src/libffmpeg/libavcodec/wmadec.c
index cf2db1494..11576b47a 100644
--- a/src/libffmpeg/libavcodec/wmadec.c
+++ b/src/libffmpeg/libavcodec/wmadec.c
@@ -31,6 +31,12 @@
  * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data.
  */
 
+/* xine: some glibc versions require _ISOC9X_SOURCE for
+ * prototyping lrintf(). failure to declare it will result
+ * in static noise being produced by wmadec.c.
+ */
+#define _ISOC9X_SOURCE 1
+ 
 #include "avcodec.h"
 #include "dsputil.h"