[xine-cvs] CVS: xine-lib/src/libffmpeg/libavcodec Makefile.am,1.16,1.17 dsputil.c,1.13,1.14

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec
In directory usw-pr-cvs1:/tmp/cvs-serv29091/src/libffmpeg/libavcodec

Modified Files:
	Makefile.am dsputil.c 
Log Message:
fix ffmpeg's default options


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile.am	15 Jul 2002 19:42:40 -0000	1.16
+++ Makefile.am	15 Jul 2002 20:34:49 -0000	1.17
@@ -6,9 +6,9 @@
 
 EXTRA_DIST = fdctref.c imgresample.c
 
-#CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@ -DHAVE_AV_CONFIG_H
+#CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@
 
-CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) -DHAVE_AV_CONFIG_H
+CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
@@ -37,7 +37,7 @@
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
 debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS) -DHAVE_AV_CONFIG_H"
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)"
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

Index: dsputil.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/dsputil.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dsputil.c	15 Jul 2002 19:42:40 -0000	1.13
+++ dsputil.c	15 Jul 2002 20:34:49 -0000	1.14
@@ -1289,7 +1289,7 @@
     use_permuted_idct = 0;
 #endif
 
-//#ifdef SIMPLE_IDCT
+#ifdef SIMPLE_IDCT
     if (ff_idct == NULL) {
         ff_idct_put = simple_idct_put;
         ff_idct_add = simple_idct_add;
@@ -1298,7 +1298,7 @@
         ff_idct_put = gen_idct_put;
         ff_idct_add = gen_idct_add;
     }
-//#endif
+#endif
 
     if(use_permuted_idct)
 #ifdef SIMPLE_IDCT