108 files changed, 63 insertions, 60 deletions
diff --git a/configure.ac b/configure.ac
index e2781cd29..c5a6dd138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1117,6 +1117,7 @@ contrib/Makefile
 contrib/a52dec/Makefile
 contrib/gsm610/Makefile
 contrib/libdca/Makefile
+contrib/libfaad/Makefile
 contrib/libmad/Makefile
 contrib/libmpcdec/Makefile
 contrib/libxdg-basedir/Makefile
@@ -1152,8 +1153,6 @@ src/input/vcd/libcdio/MSWindows/Makefile
 src/input/vcd/libcdio/image/Makefile
 src/input/vcd/libvcd/Makefile
 src/input/vcd/libvcd/libvcd/Makefile
-src/libfaad/Makefile
-src/libfaad/codebook/Makefile
 src/libffmpeg/Makefile
 src/libmpeg2/Makefile
 src/libspudec/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e0ac4b1b8..e7fdf5de5 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,5 @@
-SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec
+SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec \
+	libfaad
 
 srcdir = $(shell cd @srcdir@; pwd)
 
diff --git a/src/libfaad/Makefile.am b/contrib/libfaad/Makefile.am
index 379033b15..c417c7f05 100644
--- a/src/libfaad/Makefile.am
+++ b/contrib/libfaad/Makefile.am
@@ -3,11 +3,49 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-VPATH = @srcdir@:@srcdir@/codebook:
-
-SUBDIRS = codebook
+if ENABLE_FAAD
+noinst_LTLIBRARIES = libfaad.la
+endif
 
-noinst_HEADERS = \
+libfaad_la_SOURCES = \
+	bits.c \
+	cfft.c \
+	common.c \
+	decoder.c \
+	drc.c \
+	drm_dec.c \
+	error.c \
+	filtbank.c \
+	hcr.c \
+	huffman.c \
+	ic_predict.c \
+	is.c \
+	lt_predict.c \
+	mdct.c \
+	mp4.c \
+	ms.c \
+	output.c \
+	pns.c \
+	ps_dec.c \
+	ps_syntax.c \
+	pulse.c \
+	rvlc.c \
+	sbr_dct.c \
+	sbr_dec.c \
+	sbr_e_nf.c \
+	sbr_fbt.c \
+	sbr_hfadj.c \
+	sbr_hfgen.c \
+	sbr_huff.c \
+	sbr_qmf.c \
+	sbr_syntax.c \
+	sbr_tf_grid.c \
+	specrec.c \
+	ssr.c \
+	ssr_fb.c \
+	ssr_ipqf.c \
+	syntax.c \
+	tns.c \
 	analysis.h \
 	bits.h \
 	cfft.h \
@@ -57,50 +95,4 @@ noinst_HEADERS = \
 	syntax.h \
 	tns.h 
 
-if ENABLE_FAAD
-xineplug_LTLIBRARIES = xineplug_decode_faad.la
-endif
-
-xineplug_decode_faad_la_SOURCES = \
-	bits.c \
-	cfft.c \
-	common.c \
-	decoder.c \
-	drc.c \
-	drm_dec.c \
-	error.c \
-	filtbank.c \
-	hcr.c \
-	huffman.c \
-	ic_predict.c \
-	is.c \
-	lt_predict.c \
-	mdct.c \
-	mp4.c \
-	ms.c \
-	output.c \
-	pns.c \
-	ps_dec.c \
-	ps_syntax.c \
-	pulse.c \
-	rvlc.c \
-	sbr_dct.c \
-	sbr_dec.c \
-	sbr_e_nf.c \
-	sbr_fbt.c \
-	sbr_hfadj.c \
-	sbr_hfgen.c \
-	sbr_huff.c \
-	sbr_qmf.c \
-	sbr_syntax.c \
-	sbr_tf_grid.c \
-	specrec.c \
-	ssr.c \
-	ssr_fb.c \
-	ssr_ipqf.c \
-	syntax.c \
-	tns.c \
-	xine_faad_decoder.c
-
-xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB)
-xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+libfaad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
diff --git a/src/libfaad/analysis.h b/contrib/libfaad/analysis.h
index 810a95f3b..810a95f3b 100644
--- a/src/libfaad/analysis.h
+++ b/contrib/libfaad/analysis.h
diff --git a/src/libfaad/bits.c b/contrib/libfaad/bits.c
index ae273c7d8..ae273c7d8 100644
--- a/src/libfaad/bits.c
+++ b/contrib/libfaad/bits.c
diff --git a/src/libfaad/bits.h b/contrib/libfaad/bits.h
index 05460f0cc..05460f0cc 100644
--- a/src/libfaad/bits.h
+++ b/contrib/libfaad/bits.h
diff --git a/src/libfaad/cfft.c b/contrib/libfaad/cfft.c
index 61cac2fd5..61cac2fd5 100644
--- a/src/libfaad/cfft.c
+++ b/contrib/libfaad/cfft.c
diff --git a/src/libfaad/cfft.h b/contrib/libfaad/cfft.h
index a29537bed..a29537bed 100644
--- a/src/libfaad/cfft.h
+++ b/contrib/libfaad/cfft.h
diff --git a/src/libfaad/cfft_tab.h b/contrib/libfaad/cfft_tab.h
index 072a991f1..072a991f1 100644
--- a/src/libfaad/cfft_tab.h
+++ b/contrib/libfaad/cfft_tab.h
diff --git a/src/libfaad/codebook/Makefile.am b/contrib/libfaad/codebook/Makefile.am
index e4691f4b9..e4691f4b9 100644
--- a/src/libfaad/codebook/Makefile.am
+++ b/contrib/libfaad/codebook/Makefile.am
diff --git a/src/libfaad/codebook/hcb.h b/contrib/libfaad/codebook/hcb.h
index 96093300c..96093300c 100644
--- a/src/libfaad/codebook/hcb.h
+++ b/contrib/libfaad/codebook/hcb.h
diff --git a/src/libfaad/codebook/hcb_1.h b/contrib/libfaad/codebook/hcb_1.h
index 220299c55..220299c55 100644
--- a/src/libfaad/codebook/hcb_1.h
+++ b/contrib/libfaad/codebook/hcb_1.h
diff --git a/src/libfaad/codebook/hcb_10.h b/contrib/libfaad/codebook/hcb_10.h
index 60bcab90a..60bcab90a 100644
--- a/src/libfaad/codebook/hcb_10.h
+++ b/contrib/libfaad/codebook/hcb_10.h
diff --git a/src/libfaad/codebook/hcb_11.h b/contrib/libfaad/codebook/hcb_11.h
index bd4f647e6..bd4f647e6 100644
--- a/src/libfaad/codebook/hcb_11.h
+++ b/contrib/libfaad/codebook/hcb_11.h
diff --git a/src/libfaad/codebook/hcb_2.h b/contrib/libfaad/codebook/hcb_2.h
index 6aff6b12b..6aff6b12b 100644
--- a/src/libfaad/codebook/hcb_2.h
+++ b/contrib/libfaad/codebook/hcb_2.h
diff --git a/src/libfaad/codebook/hcb_3.h b/contrib/libfaad/codebook/hcb_3.h
index 25b54da90..25b54da90 100644
--- a/src/libfaad/codebook/hcb_3.h
+++ b/contrib/libfaad/codebook/hcb_3.h
diff --git a/src/libfaad/codebook/hcb_4.h b/contrib/libfaad/codebook/hcb_4.h
index 9378b0980..9378b0980 100644
--- a/src/libfaad/codebook/hcb_4.h
+++ b/contrib/libfaad/codebook/hcb_4.h
diff --git a/src/libfaad/codebook/hcb_5.h b/contrib/libfaad/codebook/hcb_5.h
index 7e50207e3..7e50207e3 100644
--- a/src/libfaad/codebook/hcb_5.h
+++ b/contrib/libfaad/codebook/hcb_5.h
diff --git a/src/libfaad/codebook/hcb_6.h b/contrib/libfaad/codebook/hcb_6.h
index 12417d997..12417d997 100644
--- a/src/libfaad/codebook/hcb_6.h
+++ b/contrib/libfaad/codebook/hcb_6.h
diff --git a/src/libfaad/codebook/hcb_7.h b/contrib/libfaad/codebook/hcb_7.h
index e5392326d..e5392326d 100644
--- a/src/libfaad/codebook/hcb_7.h
+++ b/contrib/libfaad/codebook/hcb_7.h
diff --git a/src/libfaad/codebook/hcb_8.h b/contrib/libfaad/codebook/hcb_8.h
index 951743bed..951743bed 100644
--- a/src/libfaad/codebook/hcb_8.h
+++ b/contrib/libfaad/codebook/hcb_8.h
diff --git a/src/libfaad/codebook/hcb_9.h b/contrib/libfaad/codebook/hcb_9.h
index daccf6197..daccf6197 100644
--- a/src/libfaad/codebook/hcb_9.h
+++ b/contrib/libfaad/codebook/hcb_9.h
diff --git a/src/libfaad/codebook/hcb_sf.h b/contrib/libfaad/codebook/hcb_sf.h
index 494053177..494053177 100644
--- a/src/libfaad/codebook/hcb_sf.h
+++ b/contrib/libfaad/codebook/hcb_sf.h
diff --git a/src/libfaad/common.c b/contrib/libfaad/common.c
index 8c0d93e95..8c0d93e95 100644
--- a/src/libfaad/common.c
+++ b/contrib/libfaad/common.c
diff --git a/src/libfaad/common.h b/contrib/libfaad/common.h
index 47832e648..47832e648 100644
--- a/src/libfaad/common.h
+++ b/contrib/libfaad/common.h
diff --git a/src/libfaad/decoder.c b/contrib/libfaad/decoder.c
index 33aee247e..33aee247e 100644
--- a/src/libfaad/decoder.c
+++ b/contrib/libfaad/decoder.c
diff --git a/src/libfaad/decoder.h b/contrib/libfaad/decoder.h
index 5a3a2663f..5a3a2663f 100644
--- a/src/libfaad/decoder.h
+++ b/contrib/libfaad/decoder.h
diff --git a/src/libfaad/diff_to_faad2_cvs.patch b/contrib/libfaad/diff_to_faad2_cvs.patch
index 0d8490f2e..0d8490f2e 100644
--- a/src/libfaad/diff_to_faad2_cvs.patch
+++ b/contrib/libfaad/diff_to_faad2_cvs.patch
diff --git a/src/libfaad/drc.c b/contrib/libfaad/drc.c
index ef4b6a96e..ef4b6a96e 100644
--- a/src/libfaad/drc.c
+++ b/contrib/libfaad/drc.c
diff --git a/src/libfaad/drc.h b/contrib/libfaad/drc.h
index 046ecbc3e..046ecbc3e 100644
--- a/src/libfaad/drc.h
+++ b/contrib/libfaad/drc.h
diff --git a/src/libfaad/drm_dec.c b/contrib/libfaad/drm_dec.c
index a782b0f22..a782b0f22 100644
--- a/src/libfaad/drm_dec.c
+++ b/contrib/libfaad/drm_dec.c
diff --git a/src/libfaad/drm_dec.h b/contrib/libfaad/drm_dec.h
index bb7d6dc93..bb7d6dc93 100644
--- a/src/libfaad/drm_dec.h
+++ b/contrib/libfaad/drm_dec.h
diff --git a/src/libfaad/error.c b/contrib/libfaad/error.c
index 2fbe08fc1..2fbe08fc1 100644
--- a/src/libfaad/error.c
+++ b/contrib/libfaad/error.c
diff --git a/src/libfaad/error.h b/contrib/libfaad/error.h
index 1009a9f57..1009a9f57 100644
--- a/src/libfaad/error.h
+++ b/contrib/libfaad/error.h
diff --git a/src/libfaad/faad.h b/contrib/libfaad/faad.h
index e46c31d87..e46c31d87 100644
--- a/src/libfaad/faad.h
+++ b/contrib/libfaad/faad.h
diff --git a/src/libfaad/filtbank.c b/contrib/libfaad/filtbank.c
index 2919b5be3..2919b5be3 100644
--- a/src/libfaad/filtbank.c
+++ b/contrib/libfaad/filtbank.c
diff --git a/src/libfaad/filtbank.h b/contrib/libfaad/filtbank.h
index 54c72c0ef..54c72c0ef 100644
--- a/src/libfaad/filtbank.h
+++ b/contrib/libfaad/filtbank.h
diff --git a/src/libfaad/fixed.h b/contrib/libfaad/fixed.h
index c58ee26cb..c58ee26cb 100644
--- a/src/libfaad/fixed.h
+++ b/contrib/libfaad/fixed.h
diff --git a/src/libfaad/hcr.c b/contrib/libfaad/hcr.c
index 94f08fd2a..94f08fd2a 100644
--- a/src/libfaad/hcr.c
+++ b/contrib/libfaad/hcr.c
diff --git a/src/libfaad/huffman.c b/contrib/libfaad/huffman.c
index 6c24a6cec..6c24a6cec 100644
--- a/src/libfaad/huffman.c
+++ b/contrib/libfaad/huffman.c
diff --git a/src/libfaad/huffman.h b/contrib/libfaad/huffman.h
index cffe23093..cffe23093 100644
--- a/src/libfaad/huffman.h
+++ b/contrib/libfaad/huffman.h
diff --git a/src/libfaad/ic_predict.c b/contrib/libfaad/ic_predict.c
index 82753a9f2..82753a9f2 100644
--- a/src/libfaad/ic_predict.c
+++ b/contrib/libfaad/ic_predict.c
diff --git a/src/libfaad/ic_predict.h b/contrib/libfaad/ic_predict.h
index 233992b96..233992b96 100644
--- a/src/libfaad/ic_predict.h
+++ b/contrib/libfaad/ic_predict.h
diff --git a/src/libfaad/iq_table.h b/contrib/libfaad/iq_table.h
index 9002e15d7..9002e15d7 100644
--- a/src/libfaad/iq_table.h
+++ b/contrib/libfaad/iq_table.h
diff --git a/src/libfaad/is.c b/contrib/libfaad/is.c
index 9fcdbcbb5..9fcdbcbb5 100644
--- a/src/libfaad/is.c
+++ b/contrib/libfaad/is.c
diff --git a/src/libfaad/is.h b/contrib/libfaad/is.h
index 0786f7258..0786f7258 100644
--- a/src/libfaad/is.h
+++ b/contrib/libfaad/is.h
diff --git a/src/libfaad/kbd_win.h b/contrib/libfaad/kbd_win.h
index 046b6b995..046b6b995 100644
--- a/src/libfaad/kbd_win.h
+++ b/contrib/libfaad/kbd_win.h
diff --git a/src/libfaad/lt_predict.c b/contrib/libfaad/lt_predict.c
index 3aab00426..3aab00426 100644
--- a/src/libfaad/lt_predict.c
+++ b/contrib/libfaad/lt_predict.c
diff --git a/src/libfaad/lt_predict.h b/contrib/libfaad/lt_predict.h
index faa2fbca7..faa2fbca7 100644
--- a/src/libfaad/lt_predict.h
+++ b/contrib/libfaad/lt_predict.h
diff --git a/src/libfaad/mdct.c b/contrib/libfaad/mdct.c
index 0df3d6aae..0df3d6aae 100644
--- a/src/libfaad/mdct.c
+++ b/contrib/libfaad/mdct.c
diff --git a/src/libfaad/mdct.h b/contrib/libfaad/mdct.h
index c2b738795..c2b738795 100644
--- a/src/libfaad/mdct.h
+++ b/contrib/libfaad/mdct.h
diff --git a/src/libfaad/mdct_tab.h b/contrib/libfaad/mdct_tab.h
index 7dd17166b..7dd17166b 100644
--- a/src/libfaad/mdct_tab.h
+++ b/contrib/libfaad/mdct_tab.h
diff --git a/src/libfaad/mp4.c b/contrib/libfaad/mp4.c
index 651280805..651280805 100644
--- a/src/libfaad/mp4.c
+++ b/contrib/libfaad/mp4.c
diff --git a/src/libfaad/mp4.h b/contrib/libfaad/mp4.h
index 478c9b9be..478c9b9be 100644
--- a/src/libfaad/mp4.h
+++ b/contrib/libfaad/mp4.h
diff --git a/src/libfaad/ms.c b/contrib/libfaad/ms.c
index 93b0a2051..93b0a2051 100644
--- a/src/libfaad/ms.c
+++ b/contrib/libfaad/ms.c
diff --git a/src/libfaad/ms.h b/contrib/libfaad/ms.h
index 4bc7c8175..4bc7c8175 100644
--- a/src/libfaad/ms.h
+++ b/contrib/libfaad/ms.h
diff --git a/src/libfaad/output.c b/contrib/libfaad/output.c
index 33ebed39c..33ebed39c 100644
--- a/src/libfaad/output.c
+++ b/contrib/libfaad/output.c
diff --git a/src/libfaad/output.h b/contrib/libfaad/output.h
index 1b15dae58..1b15dae58 100644
--- a/src/libfaad/output.h
+++ b/contrib/libfaad/output.h
diff --git a/src/libfaad/pns.c b/contrib/libfaad/pns.c
index 5266d8eef..5266d8eef 100644
--- a/src/libfaad/pns.c
+++ b/contrib/libfaad/pns.c
diff --git a/src/libfaad/pns.h b/contrib/libfaad/pns.h
index 2f246cc4f..2f246cc4f 100644
--- a/src/libfaad/pns.h
+++ b/contrib/libfaad/pns.h
diff --git a/src/libfaad/ps_dec.c b/contrib/libfaad/ps_dec.c
index 3b957bfda..3b957bfda 100644
--- a/src/libfaad/ps_dec.c
+++ b/contrib/libfaad/ps_dec.c
diff --git a/src/libfaad/ps_dec.h b/contrib/libfaad/ps_dec.h
index 978161fff..978161fff 100644
--- a/src/libfaad/ps_dec.h
+++ b/contrib/libfaad/ps_dec.h
diff --git a/src/libfaad/ps_syntax.c b/contrib/libfaad/ps_syntax.c
index fc2f9e7f2..fc2f9e7f2 100644
--- a/src/libfaad/ps_syntax.c
+++ b/contrib/libfaad/ps_syntax.c
diff --git a/src/libfaad/ps_tables.h b/contrib/libfaad/ps_tables.h
index c71489617..c71489617 100644
--- a/src/libfaad/ps_tables.h
+++ b/contrib/libfaad/ps_tables.h
diff --git a/src/libfaad/pulse.c b/contrib/libfaad/pulse.c
index 9e0a705e6..9e0a705e6 100644
--- a/src/libfaad/pulse.c
+++ b/contrib/libfaad/pulse.c
diff --git a/src/libfaad/pulse.h b/contrib/libfaad/pulse.h
index a057c0d3b..a057c0d3b 100644
--- a/src/libfaad/pulse.h
+++ b/contrib/libfaad/pulse.h
diff --git a/src/libfaad/rvlc.c b/contrib/libfaad/rvlc.c
index bad49a0c6..bad49a0c6 100644
--- a/src/libfaad/rvlc.c
+++ b/contrib/libfaad/rvlc.c
diff --git a/src/libfaad/rvlc.h b/contrib/libfaad/rvlc.h
index 867468580..867468580 100644
--- a/src/libfaad/rvlc.h
+++ b/contrib/libfaad/rvlc.h
diff --git a/src/libfaad/sbr_dct.c b/contrib/libfaad/sbr_dct.c
index ba8bbaf9b..ba8bbaf9b 100644
--- a/src/libfaad/sbr_dct.c
+++ b/contrib/libfaad/sbr_dct.c
diff --git a/src/libfaad/sbr_dct.h b/contrib/libfaad/sbr_dct.h
index 6293486c7..6293486c7 100644
--- a/src/libfaad/sbr_dct.h
+++ b/contrib/libfaad/sbr_dct.h
diff --git a/src/libfaad/sbr_dec.c b/contrib/libfaad/sbr_dec.c
index 24c1f5031..24c1f5031 100644
--- a/src/libfaad/sbr_dec.c
+++ b/contrib/libfaad/sbr_dec.c
diff --git a/src/libfaad/sbr_dec.h b/contrib/libfaad/sbr_dec.h
index 5efd5c5e0..5efd5c5e0 100644
--- a/src/libfaad/sbr_dec.h
+++ b/contrib/libfaad/sbr_dec.h
diff --git a/src/libfaad/sbr_e_nf.c b/contrib/libfaad/sbr_e_nf.c
index 2d2bf4f85..2d2bf4f85 100644
--- a/src/libfaad/sbr_e_nf.c
+++ b/contrib/libfaad/sbr_e_nf.c
diff --git a/src/libfaad/sbr_e_nf.h b/contrib/libfaad/sbr_e_nf.h
index 48874c125..48874c125 100644
--- a/src/libfaad/sbr_e_nf.h
+++ b/contrib/libfaad/sbr_e_nf.h
diff --git a/src/libfaad/sbr_fbt.c b/contrib/libfaad/sbr_fbt.c
index 511235863..511235863 100644
--- a/src/libfaad/sbr_fbt.c
+++ b/contrib/libfaad/sbr_fbt.c
diff --git a/src/libfaad/sbr_fbt.h b/contrib/libfaad/sbr_fbt.h
index 26c580efe..26c580efe 100644
--- a/src/libfaad/sbr_fbt.h
+++ b/contrib/libfaad/sbr_fbt.h
diff --git a/src/libfaad/sbr_hfadj.c b/contrib/libfaad/sbr_hfadj.c
index 081f731e9..081f731e9 100644
--- a/src/libfaad/sbr_hfadj.c
+++ b/contrib/libfaad/sbr_hfadj.c
diff --git a/src/libfaad/sbr_hfadj.h b/contrib/libfaad/sbr_hfadj.h
index aeaba32e8..aeaba32e8 100644
--- a/src/libfaad/sbr_hfadj.h
+++ b/contrib/libfaad/sbr_hfadj.h
diff --git a/src/libfaad/sbr_hfgen.c b/contrib/libfaad/sbr_hfgen.c
index 688b9a0ea..688b9a0ea 100644
--- a/src/libfaad/sbr_hfgen.c
+++ b/contrib/libfaad/sbr_hfgen.c
diff --git a/src/libfaad/sbr_hfgen.h b/contrib/libfaad/sbr_hfgen.h
index 27a58be61..27a58be61 100644
--- a/src/libfaad/sbr_hfgen.h
+++ b/contrib/libfaad/sbr_hfgen.h
diff --git a/src/libfaad/sbr_huff.c b/contrib/libfaad/sbr_huff.c
index 39ae32b9b..39ae32b9b 100644
--- a/src/libfaad/sbr_huff.c
+++ b/contrib/libfaad/sbr_huff.c
diff --git a/src/libfaad/sbr_huff.h b/contrib/libfaad/sbr_huff.h
index 631a43a8d..631a43a8d 100644
--- a/src/libfaad/sbr_huff.h
+++ b/contrib/libfaad/sbr_huff.h
diff --git a/src/libfaad/sbr_noise.h b/contrib/libfaad/sbr_noise.h
index a25fbf3cd..a25fbf3cd 100644
--- a/src/libfaad/sbr_noise.h
+++ b/contrib/libfaad/sbr_noise.h
diff --git a/src/libfaad/sbr_qmf.c b/contrib/libfaad/sbr_qmf.c
index d534a0442..d534a0442 100644
--- a/src/libfaad/sbr_qmf.c
+++ b/contrib/libfaad/sbr_qmf.c
diff --git a/src/libfaad/sbr_qmf.h b/contrib/libfaad/sbr_qmf.h
index b1d673d9c..b1d673d9c 100644
--- a/src/libfaad/sbr_qmf.h
+++ b/contrib/libfaad/sbr_qmf.h
diff --git a/src/libfaad/sbr_qmf_c.h b/contrib/libfaad/sbr_qmf_c.h
index d9c079520..d9c079520 100644
--- a/src/libfaad/sbr_qmf_c.h
+++ b/contrib/libfaad/sbr_qmf_c.h
diff --git a/src/libfaad/sbr_syntax.c b/contrib/libfaad/sbr_syntax.c
index 19cb1b5c2..19cb1b5c2 100644
--- a/src/libfaad/sbr_syntax.c
+++ b/contrib/libfaad/sbr_syntax.c
diff --git a/src/libfaad/sbr_syntax.h b/contrib/libfaad/sbr_syntax.h
index 1baa5fec3..1baa5fec3 100644
--- a/src/libfaad/sbr_syntax.h
+++ b/contrib/libfaad/sbr_syntax.h
diff --git a/src/libfaad/sbr_tf_grid.c b/contrib/libfaad/sbr_tf_grid.c
index ae741c256..ae741c256 100644
--- a/src/libfaad/sbr_tf_grid.c
+++ b/contrib/libfaad/sbr_tf_grid.c
diff --git a/src/libfaad/sbr_tf_grid.h b/contrib/libfaad/sbr_tf_grid.h
index 8772a384a..8772a384a 100644
--- a/src/libfaad/sbr_tf_grid.h
+++ b/contrib/libfaad/sbr_tf_grid.h
diff --git a/src/libfaad/sine_win.h b/contrib/libfaad/sine_win.h
index c7e6ecd6e..c7e6ecd6e 100644
--- a/src/libfaad/sine_win.h
+++ b/contrib/libfaad/sine_win.h
diff --git a/src/libfaad/specrec.c b/contrib/libfaad/specrec.c
index fd4b0653c..fd4b0653c 100644
--- a/src/libfaad/specrec.c
+++ b/contrib/libfaad/specrec.c
diff --git a/src/libfaad/specrec.h b/contrib/libfaad/specrec.h
index da174abe8..da174abe8 100644
--- a/src/libfaad/specrec.h
+++ b/contrib/libfaad/specrec.h
diff --git a/src/libfaad/ssr.c b/contrib/libfaad/ssr.c
index 46517d0c8..46517d0c8 100644
--- a/src/libfaad/ssr.c
+++ b/contrib/libfaad/ssr.c
diff --git a/src/libfaad/ssr.h b/contrib/libfaad/ssr.h
index d1defdc45..d1defdc45 100644
--- a/src/libfaad/ssr.h
+++ b/contrib/libfaad/ssr.h
diff --git a/src/libfaad/ssr_fb.c b/contrib/libfaad/ssr_fb.c
index fb62c90c6..fb62c90c6 100644
--- a/src/libfaad/ssr_fb.c
+++ b/contrib/libfaad/ssr_fb.c
diff --git a/src/libfaad/ssr_fb.h b/contrib/libfaad/ssr_fb.h
index 739a4dfbb..739a4dfbb 100644
--- a/src/libfaad/ssr_fb.h
+++ b/contrib/libfaad/ssr_fb.h
diff --git a/src/libfaad/ssr_ipqf.c b/contrib/libfaad/ssr_ipqf.c
index 3064285de..3064285de 100644
--- a/src/libfaad/ssr_ipqf.c
+++ b/contrib/libfaad/ssr_ipqf.c
diff --git a/src/libfaad/ssr_ipqf.h b/contrib/libfaad/ssr_ipqf.h
index 360db978b..360db978b 100644
--- a/src/libfaad/ssr_ipqf.h
+++ b/contrib/libfaad/ssr_ipqf.h
diff --git a/src/libfaad/ssr_win.h b/contrib/libfaad/ssr_win.h
index ddbb3086e..ddbb3086e 100644
--- a/src/libfaad/ssr_win.h
+++ b/contrib/libfaad/ssr_win.h
diff --git a/src/libfaad/structs.h b/contrib/libfaad/structs.h
index db6361a5c..db6361a5c 100644
--- a/src/libfaad/structs.h
+++ b/contrib/libfaad/structs.h
diff --git a/src/libfaad/syntax.c b/contrib/libfaad/syntax.c
index 6dc9fc57d..6dc9fc57d 100644
--- a/src/libfaad/syntax.c
+++ b/contrib/libfaad/syntax.c
diff --git a/src/libfaad/syntax.h b/contrib/libfaad/syntax.h
index a047dd644..a047dd644 100644
--- a/src/libfaad/syntax.h
+++ b/contrib/libfaad/syntax.h
diff --git a/src/libfaad/tns.c b/contrib/libfaad/tns.c
index bb4db731a..bb4db731a 100644
--- a/src/libfaad/tns.c
+++ b/contrib/libfaad/tns.c
diff --git a/src/libfaad/tns.h b/contrib/libfaad/tns.h
index fc77894d8..fc77894d8 100644
--- a/src/libfaad/tns.h
+++ b/contrib/libfaad/tns.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c5602f069..256e28bfa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@ SUBDIRS = \
 	libxinevdec \
 	libxineadec \
 	libreal \
-	libfaad \
 	post \
 	combined \
 	vdr
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index dca31834e..82099d659 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -25,9 +25,20 @@ if ENABLE_MAD
 mad_module = xineplug_decode_mad.la
 endif
 
+if ENABLE_A52DEC
+a52_module = xineplug_decode_a52.la
+endif
+
+if ENABLE_FAAD
+faad_module = xineplug_decode_faad.la
+endif
+
 $(top_builddir)/contrib/a52dec/liba52.la:
 	$(MAKE) -C $(top_builddir)/contrib/a52dec
 
+$(top_builddir)/contrib/libfaad/libfaad.la:
+	$(MAKE) -C $(top_builddir)/contrib/libfaad
+
 $(top_builddir)/contrib/libmad/libmad.la:
 	$(MAKE) -C $(top_builddir)/contrib/libmad
 
@@ -40,10 +51,6 @@ $(top_builddir)/contrib/libdca/libdca.la:
 $(top_builddir)/contrib/gsm610/libgsm610.la:
 	$(MAKE) -C $(top_builddir)/contrib/gsm610
 
-if ENABLE_A52DEC
-a52_module = xineplug_decode_a52.la
-endif
-
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_lpcm.la \
@@ -52,7 +59,8 @@ xineplug_LTLIBRARIES = \
 	$(musepack_module) \
 	$(dts_module) \
 	$(mad_module) \
-	$(a52_module)
+	$(a52_module) \
+	$(faad_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/gsm610/libgsm610.la
@@ -88,3 +96,7 @@ xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c
 xineplug_decode_a52_la_DEPENDENCIES = $(A52DEC_DEPS)
 xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(A52DEC_LIBS) -lm
 xineplug_decode_a52_la_CFLAGS = $(AM_CFLAGS) $(A52DEC_CFLAGS)
+
+xineplug_decode_faad_la_SOURCES = xine_faad_decoder.c
+xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/libfaad/libfaad.la -lm
+xineplug_decode_faad_la_CPPFLAGS = -I$(top_srcdir)/contrib/libfaad
diff --git a/src/libfaad/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c
index 169874a44..169874a44 100644
--- a/src/libfaad/xine_faad_decoder.c
+++ b/src/libxineadec/xine_faad_decoder.c