Silence compiler warnings for XL decoder

[ffmpeg] / libavcodec / libfaad.c

diff --git a/libavcodec/libfaad.c b/libavcodec/libfaad.c
index ef5b79fa932a30cdb7d843ee97518ae9eab64700..af97ca763f885fd1b748e0cb2ae1b16cf713986b 100644 (file)
--- a/libavcodec/libfaad.c
+++ b/libavcodec/libfaad.c
@@ -1,7 +1,7 @@
 /*
  * Faad decoder
- * Copyright (c) 2003 Zdenek Kabelac.
- * Copyright (c) 2004 Thomas Raivio.
+ * Copyright (c) 2003 Zdenek Kabelac
+ * Copyright (c) 2004 Thomas Raivio
  *
  * This file is part of FFmpeg.
  *
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file faad.c
+ * @file libavcodec/libfaad.c
  * AAC decoder.
  *
  * still a bit unfinished - but it plays something
@@ -35,14 +35,15 @@
 #endif
 
 /*
- * when CONFIG_LIBFAADBIN is defined the libfaad will be opened at runtime
+ * when CONFIG_LIBFAADBIN is true libfaad will be opened at runtime
  */
 //#undef CONFIG_LIBFAADBIN
-//#define CONFIG_LIBFAADBIN
+//#define CONFIG_LIBFAADBIN 0
+//#define CONFIG_LIBFAADBIN 1
 
-#ifdef CONFIG_LIBFAADBIN
+#if CONFIG_LIBFAADBIN
 #include <dlfcn.h>
-static const char* libfaadname = "libfaad.so";
+static const char* const libfaadname = "libfaad.so";
 #else
 #define dlopen(a)
 #define dlclose(a)
@@ -224,7 +225,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx)
     FAACContext *s = avctx->priv_data;
     faacDecConfigurationPtr faac_cfg;
 
-#ifdef CONFIG_LIBFAADBIN
+#if CONFIG_LIBFAADBIN
     const char* err = 0;
 
     s->handle = dlopen(libfaadname, RTLD_LAZY);
@@ -259,7 +260,7 @@ static av_cold int faac_decode_init(AVCodecContext *avctx)
 
 #undef dfaac
 
-#ifdef CONFIG_LIBFAADBIN
+#if CONFIG_LIBFAADBIN
     if (err) {
         dlclose(s->handle);
         av_log(avctx, AV_LOG_ERROR, "FAAD library: cannot resolve %s in %s!\n",