From 4d82067c91a1f5e69ce2ff97cafe0148f6c108d9 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 7 Aug 2006 08:57:43 +0000
Subject: [PATCH] cosmetics: Rename some variables for consistency.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19354 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile              | 4 ++--
 configure             | 6 +++---
 libmpcodecs/ad_faad.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 465b5b3048..f4c5ee03f6 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ endif
 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 @@ ifeq ($(LIBMPEG2),yes)
 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)
diff --git a/configure b/configure
index d62075ef68..2874959a55 100755
--- a/configure
+++ b/configure
@@ -5810,12 +5810,12 @@ EOF
 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 @@ SPEEX_LIB = $_ld_speex
 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
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c
index ce9ff96926..4577f1489c 100644
--- a/libmpcodecs/ad_faad.c
+++ b/libmpcodecs/ad_faad.c
@@ -22,7 +22,7 @@ static ad_info_t info =
 
 LIBAD_EXTERN(faad)
 
-#ifndef USE_INTERNAL_FAAD
+#ifndef USE_FAAD_INTERNAL
 #include <faad.h>
 #else
 #include "libfaad2/faad.h"