Remove recursion into modules/codec/avcodec/

configure.ac

@@ -4065,7 +4065,6 @@ AC_CONFIG_FILES([
   modules/audio_mixer/Makefile
   modules/audio_output/Makefile
   modules/codec/Makefile
-  modules/codec/avcodec/Makefile
   modules/codec/loader/Makefile
   modules/control/Makefile
   modules/demux/Makefile

modules/codec/Modules.am

-SUBDIRS = loader avcodec
+SUBDIRS = loader
 noinst_HEADERS =
 
 SOURCES_a52 = a52.c a52.h
@@ -81,6 +81,45 @@ libvlc_LTLIBRARIES += \
 	libstl_plugin.la \
 	$(NULL)
 
+### FFmpeg/libav ###
+libavcodec_plugin_la_SOURCES = \
+	avcodec/avcommon.h \
+	avcodec/video.c \
+	avcodec/subtitle.c \
+	avcodec/audio.c \
+	avcodec/cpu.c \
+	avcodec/deinterlace.c \
+	avcodec/fourcc.c \
+	avcodec/chroma.c avcodec/chroma.h \
+	avcodec/vaapi.c \
+	avcodec/dxva2.c \
+	avcodec/vda.c \
+	avcodec/copy.c avcodec/copy.h \
+	avcodec/va.h \
+	avcodec/avcodec.c avcodec/avcodec.h
+if ENABLE_SOUT
+libavcodec_plugin_la_SOURCES += \
+	avcodec/encoder.c
+endif
+libavcodec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_avcodec)
+libavcodec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_avcodec)
+libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_avcodec)
+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
+
 ### OpenMAX ###
 noinst_HEADERS += \
 	omxil/OMX_Component.h \

modules/codec/avcodec/Modules.am

-libavcodec_plugin_la_SOURCES = \
-	avcodec.c \
-	avcodec.h \
-	avcommon.h \
-	video.c \
-	subtitle.c \
-	audio.c \
-	cpu.c \
-	deinterlace.c \
-	fourcc.c \
-	chroma.h \
-	chroma.c \
-	vaapi.c \
-	dxva2.c \
-	vda.c \
-	copy.c \
-	copy.h \
-	va.h \
-	$(NULL)
-if ENABLE_SOUT
-libavcodec_plugin_la_SOURCES += \
-	encoder.c
-endif
-libavcodec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_avcodec)
-libavcodec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_avcodec)
-libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_avcodec)
-
-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