diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/libspucc/Makefile.am | 12 | ||||
| -rw-r--r-- | src/libspucmml/Makefile.am | 9 | ||||
| -rw-r--r-- | src/libspudec/Makefile.am | 21 | ||||
| -rw-r--r-- | src/libspudvb/Makefile.am | 9 | ||||
| -rw-r--r-- | src/libsputext/Makefile.am | 12 | ||||
| -rw-r--r-- | src/spu_dec/Makefile.am | 39 | ||||
| -rw-r--r-- | src/spu_dec/cc_decoder.c (renamed from src/libspucc/cc_decoder.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/cc_decoder.h (renamed from src/libspucc/cc_decoder.h) | 0 | ||||
| -rw-r--r-- | src/spu_dec/cmml_decoder.c (renamed from src/libspucmml/xine_cmml_decoder.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/nav_read.c (renamed from src/libspudec/nav_read.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/spu_decoder.c (renamed from src/libspudec/xine_spu_decoder.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/spudec.c (renamed from src/libspudec/spudec.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/spudec.h (renamed from src/libspudec/spudec.h) | 0 | ||||
| -rw-r--r-- | src/spu_dec/spudvb_decoder.c (renamed from src/libspudvb/xine_spudvb_decoder.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/sputext_decoder.c (renamed from src/libsputext/xine_sputext_decoder.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/sputext_demuxer.c (renamed from src/libsputext/demux_sputext.c) | 0 | ||||
| -rw-r--r-- | src/spu_dec/xine_cc_decoder.c (renamed from src/libspucc/xine_cc_decoder.c) | 0 |
19 files changed, 41 insertions, 73 deletions
diff --git a/configure.ac b/configure.ac index 2462d252c..af49a2746 100644 --- a/configure.ac +++ b/configure.ac @@ -1177,11 +1177,6 @@ src/input/libdvdnav/Makefile src/input/librtsp/Makefile src/input/libreal/Makefile src/input/vcd/Makefile -src/libspudec/Makefile -src/libspucc/Makefile -src/libspucmml/Makefile -src/libspudvb/Makefile -src/libsputext/Makefile src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile @@ -1197,6 +1192,7 @@ src/post/visualizations/Makefile src/post/audio/Makefile src/post/deinterlace/Makefile src/post/deinterlace/plugins/Makefile +src/spu_dec/Makefile src/video_dec/Makefile src/video_dec/libmpeg2/Makefile src/video_out/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a94673fb7..c9d9497ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,14 +8,10 @@ SUBDIRS = \ audio_dec \ video_out \ video_dec \ + spu_dec \ dxr3 \ input \ demuxers \ - libspudec \ - libspucc \ - libspucmml \ - libspudvb \ - libsputext \ libw32dll \ libreal \ post \ diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am deleted file mode 100644 index 87266505c..000000000 --- a/src/libspucc/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) - -noinst_HEADERS = cc_decoder.h - -xineplug_LTLIBRARIES = xineplug_decode_spucc.la - -xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_cc_decoder.c -xineplug_decode_spucc_la_LIBADD = $(XINE_LIB) -xineplug_decode_spucc_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing diff --git a/src/libspucmml/Makefile.am b/src/libspucmml/Makefile.am deleted file mode 100644 index 85f5dbcd9..000000000 --- a/src/libspucmml/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) - -xineplug_LTLIBRARIES = xineplug_decode_spucmml.la - -xineplug_decode_spucmml_la_SOURCES = xine_cmml_decoder.c -xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am deleted file mode 100644 index 337428652..000000000 --- a/src/libspudec/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav -AM_LDFLAGS = $(xineplug_ldflags) - -noinst_HEADERS = spudec.h - -xineplug_LTLIBRARIES = xineplug_decode_spu.la - -if WITH_EXTERNAL_DVDNAV -external_dvdnav_libs = $(DVDNAV_LIBS) -internal_dvdnav_sources = -else -external_dvdnav_libs = -internal_dvdnav_sources = nav_read.c -endif - -xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spudec.c xine_spu_decoder.c -xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(external_dvdnav_libs) $(PTHREAD_LIBS) -xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) diff --git a/src/libspudvb/Makefile.am b/src/libspudvb/Makefile.am deleted file mode 100644 index 1adb154db..000000000 --- a/src/libspudvb/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) - -xineplug_LTLIBRARIES = xineplug_decode_spudvb.la - -xineplug_decode_spudvb_la_SOURCES = xine_spudvb_decoder.c -xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am deleted file mode 100644 index 14c6f2323..000000000 --- a/src/libsputext/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) - -xineplug_LTLIBRARIES = xineplug_decode_sputext.la xineplug_dmx_sputext.la - -xineplug_dmx_sputext_la_SOURCES = demux_sputext.c -xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) - -xineplug_decode_sputext_la_SOURCES = xine_sputext_decoder.c -xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/spu_dec/Makefile.am b/src/spu_dec/Makefile.am new file mode 100644 index 000000000..c1510f794 --- /dev/null +++ b/src/spu_dec/Makefile.am @@ -0,0 +1,39 @@ +include $(top_srcdir)/misc/Makefile.common + +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + +xineplug_LTLIBRARIES = \ + xineplug_decode_spucc.la \ + xineplug_decode_spucmml.la \ + xineplug_decode_spu.la \ + xineplug_decode_spudvb.la \ + xineplug_decode_sputext.la xineplug_dmx_sputext.la + +xineplug_decode_spucc_la_SOURCES = cc_decoder.c cc_decoder.h xine_cc_decoder.c +xineplug_decode_spucc_la_LIBADD = $(XINE_LIB) +xineplug_decode_spucc_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing + +xineplug_decode_spucmml_la_SOURCES = cmml_decoder.c +xineplug_decode_spucmml_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) + +if WITH_EXTERNAL_DVDNAV +external_dvdnav_libs = $(DVDNAV_LIBS) +internal_dvdnav_sources = +else +external_dvdnav_libs = +internal_dvdnav_sources = nav_read.c +endif + +xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spudec.c spudec.h spu_decoder.c +xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(external_dvdnav_libs) $(PTHREAD_LIBS) +xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) -I$(top_srcdir)/src/input/libdvdnav + +xineplug_decode_spudvb_la_SOURCES = spudvb_decoder.c +xineplug_decode_spudvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) + +xineplug_dmx_sputext_la_SOURCES = sputext_demuxer.c +xineplug_dmx_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) + +xineplug_decode_sputext_la_SOURCES = sputext_decoder.c +xineplug_decode_sputext_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) diff --git a/src/libspucc/cc_decoder.c b/src/spu_dec/cc_decoder.c index e8fc09895..e8fc09895 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/spu_dec/cc_decoder.c diff --git a/src/libspucc/cc_decoder.h b/src/spu_dec/cc_decoder.h index 3924bb8be..3924bb8be 100644 --- a/src/libspucc/cc_decoder.h +++ b/src/spu_dec/cc_decoder.h diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/spu_dec/cmml_decoder.c index 6ce6d3f90..6ce6d3f90 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/spu_dec/cmml_decoder.c diff --git a/src/libspudec/nav_read.c b/src/spu_dec/nav_read.c index 5244bfdd6..5244bfdd6 100644 --- a/src/libspudec/nav_read.c +++ b/src/spu_dec/nav_read.c diff --git a/src/libspudec/xine_spu_decoder.c b/src/spu_dec/spu_decoder.c index e36b39fc8..e36b39fc8 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/spu_dec/spu_decoder.c diff --git a/src/libspudec/spudec.c b/src/spu_dec/spudec.c index 13136a53f..13136a53f 100644 --- a/src/libspudec/spudec.c +++ b/src/spu_dec/spudec.c diff --git a/src/libspudec/spudec.h b/src/spu_dec/spudec.h index 1e7d80596..1e7d80596 100644 --- a/src/libspudec/spudec.h +++ b/src/spu_dec/spudec.h diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c index 9008260f7..9008260f7 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/spu_dec/spudvb_decoder.c diff --git a/src/libsputext/xine_sputext_decoder.c b/src/spu_dec/sputext_decoder.c index 12d1986bb..12d1986bb 100644 --- a/src/libsputext/xine_sputext_decoder.c +++ b/src/spu_dec/sputext_decoder.c diff --git a/src/libsputext/demux_sputext.c b/src/spu_dec/sputext_demuxer.c index 270894f50..270894f50 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/spu_dec/sputext_demuxer.c diff --git a/src/libspucc/xine_cc_decoder.c b/src/spu_dec/xine_cc_decoder.c index e8a02a996..e8a02a996 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/spu_dec/xine_cc_decoder.c |