summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio_dec/Makefile.am4
-rw-r--r--src/audio_dec/ff_dvaudio_decoder.c (renamed from src/combined/ffmpeg/ff_dvaudio_decoder.c)0
-rw-r--r--src/audio_dec/ff_dvdata.h (renamed from src/combined/ffmpeg/ff_dvdata.h)0
3 files changed, 4 insertions, 0 deletions
diff --git a/src/audio_dec/Makefile.am b/src/audio_dec/Makefile.am
index fc3a6ea51..be2d17401 100644
--- a/src/audio_dec/Makefile.am
+++ b/src/audio_dec/Makefile.am
@@ -83,3 +83,7 @@ xineplug_decode_faad_la_SOURCES = xine_faad_decoder.c
xineplug_decode_faad_la_DEPENDENCIES = $(FAAD_DEPS)
xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(FAAD_LIBS) -lm
xineplug_decode_faad_la_CFLAGS = $(FAAD_CFLAGS)
+
+xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
+xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
+xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) $(FFMPEG_CFLAGS)
diff --git a/src/combined/ffmpeg/ff_dvaudio_decoder.c b/src/audio_dec/ff_dvaudio_decoder.c
index 237ec5b6d..237ec5b6d 100644
--- a/src/combined/ffmpeg/ff_dvaudio_decoder.c
+++ b/src/audio_dec/ff_dvaudio_decoder.c
diff --git a/src/combined/ffmpeg/ff_dvdata.h b/src/audio_dec/ff_dvdata.h
index fc99349d0..fc99349d0 100644
--- a/src/combined/ffmpeg/ff_dvdata.h
+++ b/src/audio_dec/ff_dvdata.h