From 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Tue, 16 Jul 2013 13:28:28 +0200
Subject: configure: uniform the defines to #define HAVE_xxx (0|1)

The configure followed 5 different convetions of defines because the next guy
always wanted to introduce a new better way to uniform it[1]. For an
hypothetic feature 'hurr' you could have had:

  * #define HAVE_HURR 1   / #undef HAVE_DURR
  * #define HAVE_HURR     / #undef HAVE_DURR
  * #define CONFIG_HURR 1 / #undef CONFIG_DURR
  * #define HAVE_HURR 1   / #define HAVE_DURR 0
  * #define CONFIG_HURR 1 / #define CONFIG_DURR 0

All is now uniform and uses:
  * #define HAVE_HURR 1
  * #define HAVE_DURR 0

We like definining to 0 as opposed to `undef` bcause it can help spot typos
and is very helpful when doing big reorganizations in the code.

[1]: http://xkcd.com/927/ related
---
 mpvcore/av_log.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'mpvcore/av_log.c')

diff --git a/mpvcore/av_log.c b/mpvcore/av_log.c
index 9fa6fc93ae..ca3ef70747 100644
--- a/mpvcore/av_log.c
+++ b/mpvcore/av_log.c
@@ -33,18 +33,18 @@
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
 
-#ifdef CONFIG_LIBAVDEVICE
+#if HAVE_LIBAVDEVICE
 #include <libavdevice/avdevice.h>
 #endif
 
-#ifdef CONFIG_LIBAVFILTER
+#if HAVE_LIBAVFILTER
 #include <libavfilter/avfilter.h>
 #endif
 
-#ifdef CONFIG_LIBAVRESAMPLE
+#if HAVE_LIBAVRESAMPLE
 #include <libavresample/avresample.h>
 #endif
-#ifdef CONFIG_LIBSWRESAMPLE
+#if HAVE_LIBSWRESAMPLE
 #include <libswresample/swresample.h>
 #endif
 
@@ -138,10 +138,10 @@ void init_libav(void)
     av_register_all();
     avformat_network_init();
 
-#ifdef CONFIG_LIBAVFILTER
+#if HAVE_LIBAVFILTER
     avfilter_register_all();
 #endif
-#ifdef CONFIG_LIBAVDEVICE
+#if HAVE_LIBAVDEVICE
     avdevice_register_all();
 #endif
 }
@@ -164,13 +164,13 @@ void print_libav_versions(int v)
     print_version(v, "libavcodec",    LIBAVCODEC_VERSION_INT,    avcodec_version());
     print_version(v, "libavformat",   LIBAVFORMAT_VERSION_INT,   avformat_version());
     print_version(v, "libswscale",    LIBSWSCALE_VERSION_INT,    swscale_version());
-#ifdef CONFIG_LIBAVFILTER
+#if HAVE_LIBAVFILTER
     print_version(v, "libavfilter",   LIBAVFILTER_VERSION_INT,   avfilter_version());
 #endif
-#ifdef CONFIG_LIBAVRESAMPLE
+#if HAVE_LIBAVRESAMPLE
     print_version(v, "libavresample", LIBAVRESAMPLE_VERSION_INT, avresample_version());
 #endif
-#ifdef CONFIG_LIBSWRESAMPLE
+#if HAVE_LIBSWRESAMPLE
     print_version(v, "libswresample", LIBSWRESAMPLE_VERSION_INT, swresample_version());
 #endif
 }
-- 
cgit v1.2.3