[vlc-devel] commit: avformat is demux/mux. Move it to modules/demux/avformat. ( Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Jun  8 00:31:54 2008 +0200| [21574c3af48d66e582466f1260175ba9c5f445f2]

avformat is demux/mux. Move it to modules/demux/avformat.

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

 configure.ac                                       |    1 +
 modules/codec/ffmpeg/Modules.am                    |   19 -------------------
 modules/demux/Modules.am                           |    2 +-
 .../{codec/ffmpeg => demux/avformat}/avformat.c    |    0 
 .../{codec/ffmpeg => demux/avformat}/avformat.h    |    0 
 modules/{codec/ffmpeg => demux/avformat}/demux.c   |    4 ++--
 modules/{codec/ffmpeg => demux/avformat}/mux.c     |    4 ++--
 7 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3dd2f62..73ec183 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5879,6 +5879,7 @@ AC_CONFIG_FILES([
   modules/control/http/Makefile
   modules/demux/Makefile
   modules/demux/asf/Makefile
+  modules/demux/avformat/Makefile
   modules/demux/avi/Makefile
   modules/demux/mp4/Makefile
   modules/demux/mpeg/Makefile
diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index ca78902..bdb15eb 100644
--- a/modules/codec/ffmpeg/Modules.am
+++ b/modules/codec/ffmpeg/Modules.am
@@ -17,23 +17,6 @@ EXTRA_libavcodec_plugin_la_SOURCES = \
 	encoder.c \
 	$(NULL)
 
-SOURCES_avformat = \
-	avformat.c \
-	avformat.h \
-	demux.c \
-	avutil.h \
-	fourcc.h \
-	chroma.h \
-	$(NULL)
-
-if ENABLE_SOUT
-SOURCES_avformat += mux.c
-endif
-
-EXTRA_libavformat_plugin_la_SOURCES = \
-	mux.c \
-	$(NULL)
-
 SOURCES_imgresample = \
 	imgresample.c \
 	imgresample.h \
@@ -44,12 +27,10 @@ SOURCES_imgresample = \
 
 libvlc_LTLIBRARIES += \
 	$(LTLIBavcodec) \
-	$(LTLIBavformat) \
 	$(LTLIBimgresample)
 
 EXTRA_LTLIBRARIES += \
 	libavcodec_plugin.la \
-	libavformat_plugin.la \
 	libimgresample_plugin.la
 
 # FIXME SOURCES_ffmpegaltivec = \
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index cd4677e..d934cd0 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = asf avi mp4 mpeg playlist
+SUBDIRS = asf avformat avi mp4 mpeg playlist
 SOURCES_a52sys = a52.c
 SOURCES_dtssys = dts.c
 SOURCES_flacsys = flac.c
diff --git a/modules/codec/ffmpeg/avformat.c b/modules/demux/avformat/avformat.c
similarity index 100%
rename from modules/codec/ffmpeg/avformat.c
rename to modules/demux/avformat/avformat.c
diff --git a/modules/codec/ffmpeg/avformat.h b/modules/demux/avformat/avformat.h
similarity index 100%
rename from modules/codec/ffmpeg/avformat.h
rename to modules/demux/avformat/avformat.h
diff --git a/modules/codec/ffmpeg/demux.c b/modules/demux/avformat/demux.c
similarity index 99%
rename from modules/codec/ffmpeg/demux.c
rename to modules/demux/avformat/demux.c
index 815e31b..85711d0 100644
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -42,8 +42,8 @@
 #   include <ffmpeg/avformat.h>
 #endif
 
-#include "fourcc.h"
-#include "chroma.h"
+#include "../../codec/ffmpeg/fourcc.h"
+#include "../../codec/ffmpeg/chroma.h"
 
 //#define AVFORMAT_DEBUG 1
 
diff --git a/modules/codec/ffmpeg/mux.c b/modules/demux/avformat/mux.c
similarity index 99%
rename from modules/codec/ffmpeg/mux.c
rename to modules/demux/avformat/mux.c
index a8b7835..f3fc73b 100644
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -41,8 +41,8 @@
 #endif
 
 #include "avformat.h"
-#include "fourcc.h"
-#include "avutil.h"
+#include "../../codec/ffmpeg/fourcc.h"
+#include "../../codec/ffmpeg/avutil.h"
 
 //#define AVFORMAT_DEBUG 1