[MPlayer-cvslog] r27371 - in trunk: Makefile libmpcodecs/ad_hwac3.c

[diego]

Author: diego
Date: Wed Jul 30 12:26:23 2008
New Revision: 27371

Log:
Use conditional compilation instead of an #ifdef around the whole file.


Modified:
   trunk/Makefile
   trunk/libmpcodecs/ad_hwac3.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Jul 30 12:26:23 2008
@@ -81,7 +81,6 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/ad_alaw.c \
               libmpcodecs/ad_dk3adpcm.c \
               libmpcodecs/ad_dvdpcm.c \
-              libmpcodecs/ad_hwac3.c \
               libmpcodecs/ad_hwmpa.c \
               libmpcodecs/ad_imaadpcm.c \
               libmpcodecs/ad_msadpcm.c \
@@ -256,7 +255,8 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += 
 SRCS_COMMON-$(HAVE_SYS_MMAN_H)       += libaf/af_export.c
 SRCS_COMMON-$(JPEG)                  += libmpcodecs/vd_ijpg.c
 SRCS_COMMON-$(LADSPA)                += libaf/af_ladspa.c
-SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c \
+SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_hwac3.c \
+                                        libmpcodecs/ad_liba52.c \
                                         liba52/crc.c \
                                         liba52/resample.c \
                                         liba52/bit_allocate.c \

Modified: trunk/libmpcodecs/ad_hwac3.c
==============================================================================
--- trunk/libmpcodecs/ad_hwac3.c	(original)
+++ trunk/libmpcodecs/ad_hwac3.c	Wed Jul 30 12:26:23 2008
@@ -11,8 +11,6 @@
 #include <unistd.h>
 
 #include "config.h"
-#ifdef USE_LIBA52
-
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mpbswap.h"
@@ -541,4 +539,3 @@ static int decode_audio_dts(unsigned cha
 
   return nr_samples * 2 * 2;
 }
-#endif