[MPlayer-cvslog] r19354 - in trunk: Makefile configure libmpcodecs/ad_faad.c

[diego]

Author: diego
Date: Mon Aug  7 10:57:43 2006
New Revision: 19354

Modified:
   trunk/Makefile
   trunk/configure
   trunk/libmpcodecs/ad_faad.c

Log:
cosmetics: Rename some variables for consistency.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Mon Aug  7 10:57:43 2006
@@ -162,7 +162,7 @@
 ifeq ($(LIBMPEG2),yes)
 PARTS += libmpeg2
 endif
-ifeq ($(INTERNAL_FAAD),yes)
+ifeq ($(FAAD_INTERNAL),yes)
 COMMON_LIBS += libfaad2/libfaad2.a 
 PARTS += libfaad2
 endif
@@ -218,7 +218,7 @@
 COMMON_DEPS += libmpeg2/libmpeg2.a
 COMMON_LIBS += libmpeg2/libmpeg2.a
 endif
-ifeq ($(INTERNAL_FAAD),yes)
+ifeq ($(FAAD_INTERNAL),yes)
 COMMON_DEPS += libfaad2/libfaad2.a
 endif
 ifeq ($(TREMOR),yes)

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Aug  7 10:57:43 2006
@@ -5810,12 +5810,12 @@
 fi
 
 if test "$_faad_internal" = yes ; then
-  _def_faad_internal="#define USE_INTERNAL_FAAD 1"
+  _def_faad_internal="#define USE_FAAD_INTERNAL 1"
   _faad=yes
 elif test "$_faad_external" = yes ; then
   _faad=yes
 else
-  _def_faad_internal="#undef USE_INTERNAL_FAAD"
+  _def_faad_internal="#undef USE_FAAD_INTERNAL"
   _faad=no
 fi
 
@@ -7398,7 +7398,7 @@
 LIBTHEORA = $_theora
 THEORA_LIB = $_ld_theora
 FAAD_LIB = $_ld_faad
-INTERNAL_FAAD = $_faad_internal
+FAAD_INTERNAL = $_faad_internal
 LIBSMBCLIENT = $_smbsupport
 SMBSUPPORT_LIB = $_ld_smb
 XMMS_PLUGINS = $_xmms

Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c	(original)
+++ trunk/libmpcodecs/ad_faad.c	Mon Aug  7 10:57:43 2006
@@ -22,7 +22,7 @@
 
 LIBAD_EXTERN(faad)
 
-#ifndef USE_INTERNAL_FAAD
+#ifndef USE_FAAD_INTERNAL
 #include <faad.h>
 #else
 #include "libfaad2/faad.h"