summaryrefslogtreecommitdiff
path: root/src/audio_dec
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-12-10 22:49:27 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-12-10 22:49:27 +0000
commit471aee5bb21bb5d568ac1ddaea0b35c18cda5c07 (patch)
tree77d42d4a0c337d4001d100b49b785f2604deeb0e /src/audio_dec
parentc6324255117128d3a7a9f614c756022d3ef7461d (diff)
parent508e9088eec8f00b5dea9571383480803d4ad45e (diff)
downloadxine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.gz
xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.bz2
Merge from 1.1.
--HG-- rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'src/audio_dec')
-rw-r--r--src/audio_dec/xine_a52_decoder.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c
index 85e20d1d4..628920fbc 100644
--- a/src/audio_dec/xine_a52_decoder.c
+++ b/src/audio_dec/xine_a52_decoder.c
@@ -53,12 +53,6 @@
# include "a52.h"
#endif
-#ifdef HAVE_A52DEC_A52_INTERNAL_H
-# include <a52dec/a52_internal.h>
-#else
-# include "a52_internal.h"
-#endif
-
#include <xine/buffer.h>
#include <xine/xineutils.h>