X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Favcodec%2FModules.am;h=cf213deba5aa15e18b04a9df6f89b45b65bf105d;hb=1640b6840ac8d6f08b527950b6e30b9035bbe6fe;hp=e47f31fc899a6a71f49ae8bde96b6375a5a947f2;hpb=d2d62531e689b20176d57fd122db06d4656a4180;p=vlc

diff --git a/modules/codec/avcodec/Modules.am b/modules/codec/avcodec/Modules.am
index e47f31fc89..cf213deba5 100644
--- a/modules/codec/avcodec/Modules.am
+++ b/modules/codec/avcodec/Modules.am
@@ -1,4 +1,4 @@
-SOURCES_avcodec = \
+libavcodec_plugin_la_SOURCES = \
 	avcodec.c \
 	avcodec.h \
 	video.c \
@@ -7,37 +7,35 @@ SOURCES_avcodec = \
 	deinterlace.c \
 	avutil.h \
 	fourcc.c \
+	chroma.h \
 	chroma.c \
 	vaapi.c \
-	vaapi.h \
+	dxva2.c \
+	copy.c \
+	copy.h \
+	va.h \
 	$(NULL)
-
 if ENABLE_SOUT
-SOURCES_avcodec += encoder.c
+libavcodec_plugin_la_SOURCES += \
+	encoder.c
 endif
+libavcodec_plugin_la_CFLAGS = $(AM_CFLAGS)
+libavcodec_plugin_la_LIBADD = $(AM_LIBADD)
+libavcodec_plugin_la_DEPENDENCIES =
 
-EXTRA_libavcodec_plugin_la_SOURCES = \
-	encoder.c \
-	$(NULL)
+if MERGE_FFMPEG
+libavcodec_plugin_la_SOURCES += \
+	../../demux/avformat/demux.c \
+	../../access/avio.c
+if ENABLE_SOUT
+libavcodec_plugin_la_SOURCES += \
+	../../demux/avformat/mux.c
+endif
+libavcodec_plugin_la_CFLAGS += -DMERGE_FFMPEG
+endif
 
 libvlc_LTLIBRARIES += \
 	$(LTLIBavcodec)
 
 EXTRA_LTLIBRARIES += \
 	libavcodec_plugin.la
-
-# FIXME SOURCES_ffmpegaltivec = \
-# FIXME 	ffmpeg.c \
-# FIXME 	ffmpeg.h \
-# FIXME 	video.c \
-# FIXME 	audio.c \
-# FIXME 	video_filter.c \
-# FIXME 	deinterlace.c \
-# FIXME 	chroma.c \
-# FIXME 	encoder.c \
-# FIXME 	postprocess.c \
-# FIXME 	demux.c \
-# FIXME 	mux.c \
-# FIXME 	scale.c \
-# FIXME 	$(NULL)
-