housekeeping with respect to the ffmpeg sync

CVS patchset: 6096
CVS date: 2004/02/01 06:08:08

3 files changed, 9 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index 3d57f4d4b..b6daac7ad 100644
--- a/CREDITS
+++ b/CREDITS
@@ -12,7 +12,7 @@ updates (the word 'maintainer' is intentionally avoided here).
 project				version			mediator
 -----------------------------------------------------------------------
 
-ffmpeg				build 4688		Mike Melanson
+ffmpeg				build 4699		Mike Melanson
 goom				1.9dev5
 gsm610				1.0.10			Mike Melanson
 liba52				0.7.4
diff --git a/ChangeLog b/ChangeLog
index e9ce37b65..e67ba1552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,13 @@ xine-lib (1-rc4)
   * raw AAC fixes and support for 5.1 AAC streams
   * AVI demuxer OpenDML (AVI2.0) support
   * fix unscaled OSD for Kaffeine
+  * new ffmpeg decoders activated:
+    * Sierra VMD audio and video
+    * Duck TrueMotion v1 (DUCK)
+    * Planar RGB (8BPS)
+    * Lossless Codecs (MSZH & ZLIB)
+    * ASV v1/v2
+    * ATI VCR1
   
 xine-lib (1-rc3a)
   * new subtitle formats: jacobsub, subviewer 2.0, subrip 0.9
diff --git a/configure.ac b/configure.ac
index 10b604d2c..50735a0a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ AC_SUBST(LIBMPEG2_CFLAGS)
 AC_SUBST(LIBFFMPEG_CFLAGS)
 
 LIBMPEG2_CFLAGS=""
-LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_DECODERS -DXINE_MPEG_ENCODER"
+LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_DECODERS -DXINE_MPEG_ENCODER -DCONFIG_ZLIB"
 
 AC_CHECK_DECL(lrintf,[AC_DEFINE(HAVE_LRINTF,1,[Define this if the 'lrintf' function is declared in math.h])],,[
 #define _ISOC9X_SOURCE