From 49fb20cb8a5da4250c978bd8cea8bd841dc0594f Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Wed, 14 Jan 2009 17:19:17 +0000
Subject: replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_
 or ARCH_ and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavdevice/alldevices.c |  4 ++--
 libavdevice/libdc1394.c  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'libavdevice')

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index b94db6335f..342e26ec10 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -29,10 +29,10 @@ unsigned avdevice_version(void)
 
 #define REGISTER_MUXER(X,x) { \
           extern AVOutputFormat x##_muxer; \
-          if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer); }
+          if(CONFIG_##X##_MUXER)   av_register_output_format(&x##_muxer); }
 #define REGISTER_DEMUXER(X,x) { \
           extern AVInputFormat x##_demuxer; \
-          if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
+          if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
 #define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
 
 void avdevice_register_all(void)
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index c01a374158..0d8e36ad63 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -23,9 +23,9 @@
 #include "config.h"
 #include "libavformat/avformat.h"
 
-#if ENABLE_LIBDC1394_2
+#if HAVE_LIBDC1394_2
 #include <dc1394/dc1394.h>
-#elif ENABLE_LIBDC1394_1
+#elif HAVE_LIBDC1394_1
 #include <libraw1394/raw1394.h>
 #include <libdc1394/dc1394_control.h>
 
@@ -45,10 +45,10 @@
 #undef free
 
 typedef struct dc1394_data {
-#if ENABLE_LIBDC1394_1
+#if HAVE_LIBDC1394_1
     raw1394handle_t handle;
     dc1394_cameracapture camera;
-#elif ENABLE_LIBDC1394_2
+#elif HAVE_LIBDC1394_2
     dc1394_t *d;
     dc1394camera_t *camera;
     dc1394video_frame_t *frame;
@@ -142,7 +142,7 @@ out:
     return -1;
 }
 
-#if ENABLE_LIBDC1394_1
+#if HAVE_LIBDC1394_1
 static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
 {
     dc1394_data* dc1394 = c->priv_data;
@@ -236,7 +236,7 @@ static int dc1394_v1_close(AVFormatContext * context)
     return 0;
 }
 
-#elif ENABLE_LIBDC1394_2
+#elif HAVE_LIBDC1394_2
 static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap)
 {
     dc1394_data* dc1394 = c->priv_data;
@@ -359,7 +359,7 @@ AVInputFormat libdc1394_demuxer = {
 };
 
 #endif
-#if ENABLE_LIBDC1394_1
+#if HAVE_LIBDC1394_1
 AVInputFormat libdc1394_demuxer = {
     .name           = "libdc1394",
     .long_name      = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"),
-- 
cgit v1.2.3