Mercurial > mplayer.hg

changeset 27339:3d8e6afe3f9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use conditional compilation instead of an #ifdef around the whole file.
author diego
date Wed, 30 Jul 2008 10:26:23 +0000
parents b23ce988b57b
children 33274ce3cce0
files Makefile libmpcodecs/ad_hwac3.c
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Jul 30 09:49:59 2008 +0000
+++ b/Makefile	Wed Jul 30 10:26:23 2008 +0000
@@ -81,7 +81,6 @@
               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)       += 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 \
--- a/libmpcodecs/ad_hwac3.c	Wed Jul 30 09:49:59 2008 +0000
+++ b/libmpcodecs/ad_hwac3.c	Wed Jul 30 10:26:23 2008 +0000
@@ -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 @@
 
   return nr_samples * 2 * 2;
 }
-#endif