diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 02:07:53 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 02:07:53 +0100 |
| commit | 69f65972dc463cf4518fbc5472020c3644177537 (patch) | |
| tree | 98ca4ad084538f92dc669ef84e2f362a98bc5d94 /src | |
| parent | 4c7302685f04c453116112e3e0874d8b98420589 (diff) | |
| download | xine-lib-69f65972dc463cf4518fbc5472020c3644177537.tar.gz xine-lib-69f65972dc463cf4518fbc5472020c3644177537.tar.bz2 | |
Move the dvaudio decoder into audio_dec.
It only used the data table from FFmpeg, which are not public anyway.
--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
rename : src/combined/ffmpeg/ff_dvdata.h => src/audio_dec/ff_dvdata.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_dec/Makefile.am | 5 | ||||
| -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 | ||||
| -rw-r--r-- | src/combined/ffmpeg/Makefile.am | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/audio_dec/Makefile.am b/src/audio_dec/Makefile.am index fc3a6ea51..fb701e947 100644 --- a/src/audio_dec/Makefile.am +++ b/src/audio_dec/Makefile.am @@ -46,6 +46,7 @@ $(top_builddir)/contrib/gsm610/libgsm610.la: xineplug_LTLIBRARIES = \ xineplug_decode_gsm610.la \ xineplug_decode_lpcm.la \ + xineplug_decode_dvaudio.la \ $(musepack_module) \ $(dts_module) \ $(mad_module) \ @@ -83,3 +84,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 diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index 13ec1a440..67c7c011a 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -7,7 +7,7 @@ AM_LDFLAGS = $(xineplug_ldflags) # this must always be included, even if the current machine has no DXR3... EXTRA_DIST = ffmpeg_encoder.c -xineplug_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la +xineplug_LTLIBRARIES = xineplug_decode_ff.la if ENABLE_DXR3 AM_CFLAGS += $(X_CFLAGS) @@ -26,7 +26,3 @@ xineplug_decode_ff_la_CFLAGS = $(AM_CFLAGS) $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_C xineplug_decode_ff_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm $(ZLIB_LIBS) \ $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) - -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) -I$(top_srcdir)/contrib/ffmpeg/libavcodec |