[vlc-commits] Remove recursion into modules/codec/avcodec/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 15:49:12 2012 +0300| [65bb5e96d099ab8d8fe680c0e7ed10423deb5a85] | committer: Rémi Denis-Courmont

Remove recursion into modules/codec/avcodec/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65bb5e96d099ab8d8fe680c0e7ed10423deb5a85
---

 configure.ac                     |    1 -
 modules/codec/Modules.am         |   41 +++++++++++++++++++++++++++++++++++-
 modules/codec/avcodec/Modules.am |   43 --------------------------------------
 3 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0fcd602..4a62ef6 100644
--- a/configure.ac
+++ b/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
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 0638c23..4dc6fd8 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,4 @@
-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 \
diff --git a/modules/codec/avcodec/Modules.am b/modules/codec/avcodec/Modules.am
deleted file mode 100644
index a24659f..0000000
--- a/modules/codec/avcodec/Modules.am
+++ /dev/null
@@ -1,43 +0,0 @@
-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