Commit 21574c3a authored by Antoine Cellerier's avatar Antoine Cellerier

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

parent 25f84cd9
......@@ -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
......
......@@ -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 = \
......
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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment