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

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

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 = \

modules/demux/Modules.am

-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

modules/codec/ffmpeg/demux.c → 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
 

modules/codec/ffmpeg/mux.c → 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