diff --git a/configure.ac b/configure.ac index 6dc64441c5..d288590c7f 100644 --- a/configure.ac +++ b/configure.ac @@ -4219,7 +4219,6 @@ AC_CONFIG_FILES([ modules/audio_filter/Makefile modules/audio_mixer/Makefile modules/audio_output/Makefile - modules/codec/Makefile modules/control/Makefile modules/demux/Makefile modules/gui/Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am index 43fdf302c0..02b0442066 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,10 +1,10 @@ noinst_LTLIBRARIES = +noinst_HEADERS = BASE_SUBDIRS = \ access/rtp \ audio_filter \ audio_mixer \ audio_output \ - codec \ control \ demux \ gui \ @@ -57,6 +57,7 @@ endif include common.am include access/Makefile.am +include codec/Makefile.am if HAVE_WIN32 module.rc: $(top_builddir)/modules/module.rc.in $(top_builddir)/config.status diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am index 106b18321e..92ae800e25 100644 --- a/modules/codec/Makefile.am +++ b/modules/codec/Makefile.am @@ -1,14 +1,12 @@ -include ../common.am codecdir = $(pluginsdir)/codec codec_LTLIBRARIES = -EXTRA_LTLIBRARIES = -noinst_HEADERS = -noinst_LTLIBRARIES = -libddummy_plugin_la_SOURCES = ddummy.c +AM_CPPFLAGS += -I$(srcdir)/codec + +libddummy_plugin_la_SOURCES = codec/ddummy.c codec_LTLIBRARIES += libddummy_plugin.la -libedummy_plugin_la_SOURCES = edummy.c +libedummy_plugin_la_SOURCES = codec/edummy.c if ENABLE_SOUT codec_LTLIBRARIES += libedummy_plugin.la endif @@ -16,60 +14,60 @@ endif ### Audio codecs ### -liba52_plugin_la_SOURCES = a52.c a52.h +liba52_plugin_la_SOURCES = codec/a52.c codec/a52.h codec_LTLIBRARIES += liba52_plugin.la -libadpcm_plugin_la_SOURCES = adpcm.c +libadpcm_plugin_la_SOURCES = codec/adpcm.c codec_LTLIBRARIES += libadpcm_plugin.la -libaes3_plugin_la_SOURCES = aes3.c +libaes3_plugin_la_SOURCES = codec/aes3.c codec_LTLIBRARIES += libaes3_plugin.la -libaraw_plugin_la_SOURCES = araw.c +libaraw_plugin_la_SOURCES = codec/araw.c codec_LTLIBRARIES += libaraw_plugin.la -libdts_plugin_la_SOURCES = dts.c +libdts_plugin_la_SOURCES = codec/dts.c libdts_plugin_la_LIBADD = libvlc_dts_header.la codec_LTLIBRARIES += libdts_plugin.la -libvlc_dts_header_la_SOURCES = dts_header.c dts_header.h +libvlc_dts_header_la_SOURCES = codec/dts_header.c codec/dts_header.h libvlc_dts_header_la_LDFLAGS = -static noinst_LTLIBRARIES += libvlc_dts_header.la -libfaad_plugin_la_SOURCES = faad.c +libfaad_plugin_la_SOURCES = codec/faad.c libfaad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_faad) libfaad_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libfaad_plugin_la_LIBADD = $(LIBS_faad) $(LIBM) EXTRA_LTLIBRARIES += libfaad_plugin.la codec_LTLIBRARIES += $(LTLIBfaad) -libg711_plugin_la_SOURCES = g711.c +libg711_plugin_la_SOURCES = codec/g711.c codec_LTLIBRARIES += libg711_plugin.la -libfluidsynth_plugin_la_SOURCES = fluidsynth.c +libfluidsynth_plugin_la_SOURCES = codec/fluidsynth.c libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLUIDSYNTH_CFLAGS) libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libfluidsynth_plugin_la_LIBADD = $(FLUIDSYNTH_LIBS) EXTRA_LTLIBRARIES += libfluidsynth_plugin.la codec_LTLIBRARIES += $(LTLIBfluidsynth) -liblpcm_plugin_la_SOURCES = lpcm.c +liblpcm_plugin_la_SOURCES = codec/lpcm.c codec_LTLIBRARIES += liblpcm_plugin.la -libmpeg_audio_plugin_la_SOURCES = mpeg_audio.c +libmpeg_audio_plugin_la_SOURCES = codec/mpeg_audio.c codec_LTLIBRARIES += libmpeg_audio_plugin.la -libuleaddvaudio_plugin_la_SOURCES = uleaddvaudio.c +libuleaddvaudio_plugin_la_SOURCES = codec/uleaddvaudio.c codec_LTLIBRARIES += libuleaddvaudio_plugin.la libwma_fixed_plugin_la_SOURCES = \ - wmafixed/asf.h wmafixed/bswap.h \ - wmafixed/fft.c wmafixed/fft.h \ - wmafixed/mdct.c wmafixed/mdct.h \ - wmafixed/wma.c wmafixed/wmadeci.c \ - wmafixed/bitstream.c wmafixed/bitstream.h \ - wmafixed/wmadata.h wmafixed/wmadec.h \ - wmafixed/wmafixed.c wmafixed/wmafixed.h + codec/wmafixed/asf.h codec/wmafixed/bswap.h \ + codec/wmafixed/fft.c codec/wmafixed/fft.h \ + codec/wmafixed/mdct.c codec/wmafixed/mdct.h \ + codec/wmafixed/wma.c codec/wmafixed/wmadeci.c \ + codec/wmafixed/bitstream.c codec/wmafixed/bitstream.h \ + codec/wmafixed/wmadata.h codec/wmafixed/wmadec.h \ + codec/wmafixed/wmafixed.c codec/wmafixed/wmafixed.h libwma_fixed_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libwma_fixed_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' EXTRA_LTLIBRARIES += libwma_fixed_plugin.la @@ -78,20 +76,20 @@ codec_LTLIBRARIES += $(LTLIBwma_fixed) ### Video codecs ### -libcdg_plugin_la_SOURCES = cdg.c +libcdg_plugin_la_SOURCES = codec/cdg.c codec_LTLIBRARIES += libcdg_plugin.la -liblibmpeg2_plugin_la_SOURCES = libmpeg2.c +liblibmpeg2_plugin_la_SOURCES = codec/libmpeg2.c liblibmpeg2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_libmpeg2) liblibmpeg2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' liblibmpeg2_plugin_la_LIBADD = $(LIBS_libmpeg2) EXTRA_LTLIBRARIES += liblibmpeg2_plugin.la codec_LTLIBRARIES += $(LTLIBlibmpeg2) -librawvideo_plugin_la_SOURCES = rawvideo.c +librawvideo_plugin_la_SOURCES = codec/rawvideo.c codec_LTLIBRARIES += librawvideo_plugin.la -libschroedinger_plugin_la_SOURCES = schroedinger.c +libschroedinger_plugin_la_SOURCES = codec/schroedinger.c libschroedinger_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_schroedinger) libschroedinger_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libschroedinger_plugin_la_LIBADD = $(LIBS_schroedinger) @@ -101,20 +99,20 @@ codec_LTLIBRARIES += $(LTLIBschroedinger) ### Image codecs ### -libpng_plugin_la_SOURCES = png.c +libpng_plugin_la_SOURCES = codec/png.c libpng_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libpng_plugin_la_LIBADD = -lpng -lz $(LIBM) EXTRA_LTLIBRARIES += libpng_plugin.la codec_LTLIBRARIES += $(LTLIBpng) -libsdl_image_plugin_la_SOURCES = sdl_image.c +libsdl_image_plugin_la_SOURCES = codec/sdl_image.c libsdl_image_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_IMAGE_CFLAGS) libsdl_image_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libsdl_image_plugin_la_LIBADD = $(SDL_IMAGE_LIBS) EXTRA_LTLIBRARIES += libsdl_image_plugin.la codec_LTLIBRARIES += $(LTLIBsdl_image) -libxwd_plugin_la_SOURCES = xwd.c +libxwd_plugin_la_SOURCES = codec/xwd.c libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS) libxwd_plugin_la_LIBADD = $(XPROTO_LIBS) libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' @@ -124,7 +122,7 @@ EXTRA_LTLIBRARIES += libxwd_plugin.la ### SPU ### -liblibass_plugin_la_SOURCES = libass.c +liblibass_plugin_la_SOURCES = codec/libass.c liblibass_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_libass) liblibass_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBASS_CFLAGS) liblibass_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' @@ -132,45 +130,45 @@ liblibass_plugin_la_LIBADD = $(LIBASS_LIBS) $(LIBS_libass) EXTRA_LTLIBRARIES += liblibass_plugin.la codec_LTLIBRARIES += $(LTLIBlibass) -libcc_plugin_la_SOURCES = cc.c cc.h substext.h +libcc_plugin_la_SOURCES = codec/cc.c codec/cc.h codec/substext.h codec_LTLIBRARIES += libcc_plugin.la -libcvdsub_plugin_la_SOURCES = cvdsub.c +libcvdsub_plugin_la_SOURCES = codec/cvdsub.c codec_LTLIBRARIES += libcvdsub_plugin.la -libdvbsub_plugin_la_SOURCES = dvbsub.c +libdvbsub_plugin_la_SOURCES = codec/dvbsub.c codec_LTLIBRARIES += libdvbsub_plugin.la -libscte27_plugin_la_SOURCES = scte27.c +libscte27_plugin_la_SOURCES = codec/scte27.c codec_LTLIBRARIES += libscte27_plugin.la -libspudec_plugin_la_SOURCES = spudec/spudec.c spudec/parse.c spudec/spudec.h +libspudec_plugin_la_SOURCES = codec/spudec/spudec.c codec/spudec/parse.c codec/spudec/spudec.h libspudec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) codec_LTLIBRARIES += libspudec_plugin.la -libstl_plugin_la_SOURCES = stl.c +libstl_plugin_la_SOURCES = codec/stl.c codec_LTLIBRARIES += libstl_plugin.la -libsubsdec_plugin_la_SOURCES = subsdec.c substext.h +libsubsdec_plugin_la_SOURCES = codec/subsdec.c codec/substext.h codec_LTLIBRARIES += libsubsdec_plugin.la -libsubsusf_plugin_la_SOURCES = subsusf.c +libsubsusf_plugin_la_SOURCES = codec/subsusf.c codec_LTLIBRARIES += libsubsusf_plugin.la -libsvcdsub_plugin_la_SOURCES = svcdsub.c +libsvcdsub_plugin_la_SOURCES = codec/svcdsub.c codec_LTLIBRARIES += libsvcdsub_plugin.la -libt140_plugin_la_SOURCES = t140.c +libt140_plugin_la_SOURCES = codec/t140.c if ENABLE_SOUT codec_LTLIBRARIES += libt140_plugin.la endif -libtelx_plugin_la_SOURCES = telx.c +libtelx_plugin_la_SOURCES = codec/telx.c libtelx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' EXTRA_LTLIBRARIES += libtelx_plugin.la codec_LTLIBRARIES += $(LTLIBtelx) -libzvbi_plugin_la_SOURCES = zvbi.c +libzvbi_plugin_la_SOURCES = codec/zvbi.c libzvbi_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS) $(CFLAGS_zvbi) libzvbi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libzvbi_plugin_la_LIBADD = $(ZVBI_LIBS) $(SOCKET_LIBS) @@ -183,49 +181,49 @@ codec_LTLIBRARIES += $(LTLIBzvbi) ### Xiph ### -libflac_plugin_la_SOURCES = flac.c +libflac_plugin_la_SOURCES = codec/flac.c libflac_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLAC_CFLAGS) libflac_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libflac_plugin_la_LIBADD = $(FLAC_LIBS) EXTRA_LTLIBRARIES += libflac_plugin.la codec_LTLIBRARIES += $(LTLIBflac) -libkate_plugin_la_SOURCES = kate.c +libkate_plugin_la_SOURCES = codec/kate.c libkate_plugin_la_CFLAGS = $(AM_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS) libkate_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libkate_plugin_la_LIBADD = $(TIGER_LIBS) $(KATE_LIBS) $(LIBM) EXTRA_LTLIBRARIES += libkate_plugin.la codec_LTLIBRARIES += $(LTLIBkate) -libopus_plugin_la_SOURCES = opus.c opus_header.c opus_header.h +libopus_plugin_la_SOURCES = codec/opus.c codec/opus_header.c codec/opus_header.h libopus_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPUS_CFLAGS) libopus_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libopus_plugin_la_LIBADD = $(OPUS_LIBS) $(LIBM) EXTRA_LTLIBRARIES += libopus_plugin.la codec_LTLIBRARIES += $(LTLIBopus) -libspeex_plugin_la_SOURCES = speex.c +libspeex_plugin_la_SOURCES = codec/speex.c libspeex_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEX_CFLAGS) libspeex_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libspeex_plugin_la_LIBADD = $(SPEEX_LIBS) $(LIBM) EXTRA_LTLIBRARIES += libspeex_plugin.la codec_LTLIBRARIES += $(LTLIBspeex) -libtheora_plugin_la_SOURCES = theora.c +libtheora_plugin_la_SOURCES = codec/theora.c libtheora_plugin_la_CFLAGS = $(AM_CFLAGS) $(THEORA_CFLAGS) libtheora_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libtheora_plugin_la_LIBADD = $(THEORA_LIBS) EXTRA_LTLIBRARIES += libtheora_plugin.la codec_LTLIBRARIES += $(LTLIBtheora) -libtremor_plugin_la_SOURCES = vorbis.c +libtremor_plugin_la_SOURCES = codec/vorbis.c libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libtremor_plugin_la_LIBADD = -lvorbisdec -logg EXTRA_LTLIBRARIES += libtremor_plugin.la codec_LTLIBRARIES += $(LTLIBtremor) -libvorbis_plugin_la_SOURCES = vorbis.c +libvorbis_plugin_la_SOURCES = codec/vorbis.c libvorbis_plugin_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS) libvorbis_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libvorbis_plugin_la_LIBADD = $(VORBIS_LIBS) @@ -236,18 +234,18 @@ codec_LTLIBRARIES += $(LTLIBvorbis) ### FFmpeg/libav ### libavcodec_plugin_la_SOURCES = \ - avcodec/avcommon_compat.h \ - avcodec/avcommon.h \ - avcodec/video.c \ - avcodec/subtitle.c \ - avcodec/audio.c \ - avcodec/cpu.c \ - avcodec/fourcc.c \ - avcodec/chroma.c avcodec/chroma.h \ - avcodec/va.c avcodec/va.h \ - avcodec/avcodec.c avcodec/avcodec.h + codec/avcodec/avcommon_compat.h \ + codec/avcodec/avcommon.h \ + codec/avcodec/video.c \ + codec/avcodec/subtitle.c \ + codec/avcodec/audio.c \ + codec/avcodec/cpu.c \ + codec/avcodec/fourcc.c \ + codec/avcodec/chroma.c codec/avcodec/chroma.h \ + codec/avcodec/va.c codec/avcodec/va.h \ + codec/avcodec/avcodec.c codec/avcodec/avcodec.h if ENABLE_SOUT -libavcodec_plugin_la_SOURCES += avcodec/encoder.c +libavcodec_plugin_la_SOURCES += codec/avcodec/encoder.c endif libavcodec_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) libavcodec_plugin_la_LIBADD = $(AVCODEC_LIBS) $(LIBM) @@ -257,14 +255,11 @@ libavcodec_plugin_la_DEPENDENCIES = libavcodec_plugin.rc.o endif if MERGE_FFMPEG -libavcodec_plugin_la_SOURCES += \ - ../demux/avformat/demux.c \ - ../access/avio.c +libavcodec_plugin_la_SOURCES += demux/avformat/demux.c access/avio.c libavcodec_plugin_la_CFLAGS += $(AVFORMAT_CFLAGS) libavcodec_plugin_la_LIBADD += $(AVFORMAT_LIBS) if ENABLE_SOUT -libavcodec_plugin_la_SOURCES += \ - ../demux/avformat/mux.c +libavcodec_plugin_la_SOURCES += demux/avformat/mux.c endif libavcodec_plugin_la_CFLAGS += -DMERGE_FFMPEG endif @@ -275,8 +270,8 @@ endif ### avcodec hardware acceleration ### libvaapi_plugin_la_SOURCES = \ - avcodec/copy.c avcodec/copy.h \ - avcodec/vaapi.c + codec/avcodec/copy.c codec/avcodec/copy.h \ + codec/avcodec/vaapi.c libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) \ $(LIBVA_CFLAGS) $(X_CFLAGS) $(AVCODEC_CFLAGS) libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 @@ -285,8 +280,8 @@ codec_LTLIBRARIES += libvaapi_plugin.la endif libdxva2_plugin_la_SOURCES = \ - avcodec/copy.c avcodec/copy.h \ - avcodec/dxva2.c + codec/avcodec/copy.c codec/avcodec/copy.h \ + codec/avcodec/dxva2.c libdxva2_plugin_la_LIBADD = -lole32 -lshlwapi -luuid if HAVE_AVCODEC_DXVA2 codec_LTLIBRARIES += libdxva2_plugin.la @@ -294,15 +289,15 @@ endif libdxva2_plugin_la_DEPENDENCIES = libdxva2_plugin.rc.o libvda_plugin_la_SOURCES = \ - avcodec/copy.c avcodec/copy.h \ - avcodec/vda.c + codec/avcodec/copy.c codec/avcodec/copy.h \ + codec/avcodec/vda.c libvda_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS) libvda_plugin_la_LDFLAGS = -Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore if HAVE_AVCODEC_VDA codec_LTLIBRARIES += libvda_plugin.la endif -libhwdummy_plugin_la_SOURCES = avcodec/hwdummy.c +libhwdummy_plugin_la_SOURCES = codec/avcodec/hwdummy.c libhwdummy_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) $(AVCODEC_CFLAGS) libhwdummy_plugin_la_LIBADD = $(AVCODEC_LIBS) # FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0 @@ -317,28 +312,28 @@ endif ### OpenMAX ### noinst_HEADERS += \ - omxil/OMX_Broadcom.h \ - omxil/OMX_Component.h \ - omxil/OMX_Core.h \ - omxil/OMX_Image.h \ - omxil/OMX_IVCommon.h \ - omxil/OMX_Types.h \ - omxil/OMX_Audio.h \ - omxil/OMX_Index.h \ - omxil/OMX_Other.h \ - omxil/OMX_Video.h + codec/omxil/OMX_Broadcom.h \ + codec/omxil/OMX_Component.h \ + codec/omxil/OMX_Core.h \ + codec/omxil/OMX_Image.h \ + codec/omxil/OMX_IVCommon.h \ + codec/omxil/OMX_Types.h \ + codec/omxil/OMX_Audio.h \ + codec/omxil/OMX_Index.h \ + codec/omxil/OMX_Other.h \ + codec/omxil/OMX_Video.h libomxil_plugin_la_SOURCES = \ - omxil/utils.c omxil/omxil_utils.h \ - h264_nal.h \ - omxil/qcom.c omxil/qcom.h \ - omxil/omxil.c omxil/omxil.h omxil/omxil_core.c omxil/omxil_core.h -libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil) + codec/omxil/utils.c codec/omxil/omxil_utils.h \ + codec/h264_nal.h \ + codec/omxil/qcom.c codec/omxil/qcom.h \ + codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c codec/omxil/omxil_core.h +libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil) libomxil_plugin_la_LIBADD = $(LIBDL) libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' -libomxil_vout_plugin_la_SOURCES = omxil/vout.c omxil/omxil_core.c omxil/utils.c omxil/qcom.c -libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil_vout) +libomxil_vout_plugin_la_SOURCES = codec/omxil/vout.c codec/omxil/omxil_core.c codec/omxil/utils.c codec/omxil/qcom.c +libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil $(CFLAGS_omxil_vout) libomxil_vout_plugin_la_LIBADD = $(LIBDL) libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' @@ -346,8 +341,8 @@ libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES) libiomx_plugin_la_CPPFLAGS = $(libomxil_plugin_la_CPPFLAGS) -DUSE_IOMX libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD) -libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil -libmediacodec_plugin_la_SOURCES = omxil/android_mediacodec.c omxil/utils.c +libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil +libmediacodec_plugin_la_SOURCES = codec/omxil/android_mediacodec.c codec/omxil/utils.c codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout) EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la @@ -358,26 +353,26 @@ endif ### X26x encoders ### -libx262_plugin_la_SOURCES = x264.c +libx262_plugin_la_SOURCES = codec/x264.c libx262_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_x262 libx262_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x262) -libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x262) +libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x262) -rpath '$(codecdir)' libx262_plugin_la_LIBADD = $(LIBS_x262) EXTRA_LTLIBRARIES += libx262_plugin.la codec_LTLIBRARIES += $(LTLIBx262) -libx264_plugin_la_SOURCES = x264.c +libx264_plugin_la_SOURCES = codec/x264.c libx264_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_x264) -DMODULE_NAME_IS_x264 libx264_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x264) -libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x264) +libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x264) -rpath '$(codecdir)' libx264_plugin_la_LIBADD = $(LIBS_x264) EXTRA_LTLIBRARIES += libx264_plugin.la codec_LTLIBRARIES += $(LTLIBx264) -libx26410b_plugin_la_SOURCES = x264.c +libx26410b_plugin_la_SOURCES = codec/x264.c libx26410b_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_x26410b libx26410b_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x26410b) -libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x26410b) +libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x26410b) -rpath '$(codecdir)' libx26410b_plugin_la_LIBADD = $(LIBS_x26410b) EXTRA_LTLIBRARIES += libx26410b_plugin.la codec_LTLIBRARIES += $(LTLIBx26410b) @@ -385,27 +380,27 @@ codec_LTLIBRARIES += $(LTLIBx26410b) ### Misc encoders ### -libdirac_plugin_la_SOURCES = dirac.c +libdirac_plugin_la_SOURCES = codec/dirac.c libdirac_plugin_la_CFLAGS = $(AM_CFLAGS) $(DIRAC_CFLAGS) libdirac_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libdirac_plugin_la_LIBADD = $(DIRAC_LIBS) EXTRA_LTLIBRARIES += libdirac_plugin.la codec_LTLIBRARIES += $(LTLIBdirac) -libfdkaac_plugin_la_SOURCES = fdkaac.c +libfdkaac_plugin_la_SOURCES = codec/fdkaac.c libfdkaac_plugin_la_CFLAGS = $(AM_CFLAGS) $(FDKAAC_CFLAGS) libfdkaac_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libfdkaac_plugin_la_LIBADD = $(FDKAAC_LIBS) EXTRA_LTLIBRARIES += libfdkaac_plugin.la codec_LTLIBRARIES += $(LTLIBfdkaac) -libshine_plugin_la_SOURCES = shine/shine_mod.c shine/enc_base.h -EXTRA_libshine_plugin_la_SOURCES = shine/shine.c +libshine_plugin_la_SOURCES = codec/shine/shine_mod.c codec/shine/enc_base.h +EXTRA_libshine_plugin_la_SOURCES = codec/shine/shine.c libshine_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' EXTRA_LTLIBRARIES += libshine_plugin.la codec_LTLIBRARIES += $(LTLIBshine) -libtwolame_plugin_la_SOURCES = twolame.c +libtwolame_plugin_la_SOURCES = codec/twolame.c libtwolame_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libtwolame_plugin_la_CFLAGS = $(AM_CFLAGS) $(TWOLAME_CFLAGS) libtwolame_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' @@ -416,13 +411,13 @@ codec_LTLIBRARIES += $(LTLIBtwolame) ### Hardware encoders ### -libcrystalhd_plugin_la_SOURCES = crystalhd.c h264_nal.h +libcrystalhd_plugin_la_SOURCES = codec/crystalhd.c codec/h264_nal.h libcrystalhd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libcrystalhd_plugin_la_LIBADD = $(LIBS_crystalhd) EXTRA_LTLIBRARIES += libcrystalhd_plugin.la codec_LTLIBRARIES += $(LTLIBcrystalhd) -libqsv_plugin_la_SOURCES = qsv.c +libqsv_plugin_la_SOURCES = codec/qsv.c libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS) libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' libqsv_plugin_la_LIBADD = $(MFX_LIBS) @@ -432,7 +427,7 @@ codec_LTLIBRARIES += $(LTLIBqsv) ### External frameworks ### -libdmo_plugin_la_SOURCES = dmo/dmo.c dmo/dmo.h dmo/buffer.c +libdmo_plugin_la_SOURCES = codec/dmo/dmo.c codec/dmo/dmo.h codec/dmo/buffer.c libqsv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) libdmo_plugin_la_LIBADD = $(LIBM) if HAVE_WIN32 @@ -440,7 +435,7 @@ libdmo_plugin_la_LIBADD += -lole32 -luuid codec_LTLIBRARIES += libdmo_plugin.la endif -libquicktime_plugin_la_SOURCES = quicktime.c +libquicktime_plugin_la_SOURCES = codec/quicktime.c libquicktime_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdirt)' libquicktime_plugin_la_LIBADD = $(LIBM) EXTRA_LTLIBRARIES += libquicktime_plugin.la diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index ac38fd7d7f..ebfa263192 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -63,7 +63,7 @@ demux_LTLIBRARIES += libavformat_plugin.la endif libes_plugin_la_SOURCES = mpeg/es.c -libes_plugin_la_LIBADD = ../codec/libvlc_dts_header.la +libes_plugin_la_LIBADD = ../libvlc_dts_header.la if HAVE_WIN32 libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o endif