Fixed DVB-subtitles decoder subpicture flag.

[vlc] / modules / codec / avcodec / Modules.am

diff --git a/modules/codec/avcodec/Modules.am b/modules/codec/avcodec/Modules.am
index 013faca491fb2905d3663e923a3724e0a2483ec7..db3195eca2ca0e9ef19d2a8d8f1b3df17e20b61d 100644 (file)
--- 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 \
@@ -9,15 +9,27 @@ SOURCES_avcodec = \
        fourcc.c \
        chroma.c \
        vaapi.c \
+       dxva2.c \
+       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)