From 0a749ffdc5ecaf1d34d53dfc8e12c6c3be121758 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 5 Aug 2008 08:47:51 +0000
Subject: Rename preprocessor directives related to image libraries. Change a
 HAVE_ prefix to a CONFIG_ prefix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demuxer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmpdemux/demuxer.c')

diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 2b96119ca0..b9220ccc3e 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -110,7 +110,7 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_fli,
     &demuxer_desc_film,
     &demuxer_desc_roq,
-#ifdef HAVE_GIF
+#ifdef CONFIG_GIF
     &demuxer_desc_gif,
 #endif
 #ifdef CONFIG_OGGVORBIS
-- 
cgit v1.2.3


From 141e81cce4fb780a1e2f791c79c1664956401af7 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 7 Aug 2008 08:58:07 +0000
Subject: Rename a bunch of miscellaneous preprocessor directives. Switch them
 from a HAVE_ to a CONFIG_ prefix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demuxer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmpdemux/demuxer.c')

diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index b9220ccc3e..862a0e4310 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -149,7 +149,7 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef CONFIG_LIBNUT
     &demuxer_desc_nut,
 #endif
-#ifdef HAVE_XMMS
+#ifdef CONFIG_XMMS
     &demuxer_desc_xmms,
 #endif
     /* Please do not add any new demuxers here. If you want to implement a new
-- 
cgit v1.2.3


From e98e792843a2fc6f4cec00803a4efa7a71eab7b3 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 7 Aug 2008 11:19:54 +0000
Subject: 10l: MUSEPACK --> CONFIG_MUSEPACK

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demuxer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmpdemux/demuxer.c')

diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 862a0e4310..a330a427aa 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -139,7 +139,7 @@ const demuxer_desc_t *const demuxer_list[] = {
 #ifdef CONFIG_LIBAVFORMAT
     &demuxer_desc_lavf,
 #endif
-#ifdef MUSEPACK
+#ifdef CONFIG_MUSEPACK
     &demuxer_desc_mpc,
 #endif
 #ifdef CONFIG_LIBDV095
-- 
cgit v1.2.3


From e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 7 Aug 2008 12:20:50 +0000
Subject: Give a CONFIG_ prefix to preprocessor directives that lacked one and
 change arbitrary prefixes to CONFIG_.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demuxer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libmpdemux/demuxer.c')

diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index a330a427aa..20130332fd 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -130,10 +130,10 @@ const demuxer_desc_t *const demuxer_list[] = {
     &demuxer_desc_h264_es,
     &demuxer_desc_audio,
     &demuxer_desc_mpeg_ty,
-#ifdef STREAMING_LIVE555
+#ifdef CONFIG_LIVE555
     &demuxer_desc_rtp,
 #endif
-#ifdef LIBNEMESI
+#ifdef CONFIG_LIBNEMESI
     &demuxer_desc_rtp_nemesi,
 #endif
 #ifdef CONFIG_LIBAVFORMAT
-- 
cgit v1.2.3