Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
21574c3a
Commit
21574c3a
authored
Jun 08, 2008
by
dionoea
Browse files
avformat is demux/mux. Move it to modules/demux/avformat.
parent
25f84cd9
Changes
7
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
21574c3a
...
...
@@ -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
View file @
21574c3a
...
...
@@ -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
View file @
21574c3a
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
/avformat.c
→
modules/
demux/avformat
/avformat.c
View file @
21574c3a
File moved
modules/
codec/ffmpeg
/avformat.h
→
modules/
demux/avformat
/avformat.h
View file @
21574c3a
File moved
modules/
codec/ffmpeg
/demux.c
→
modules/
demux/avformat
/demux.c
View file @
21574c3a
...
...
@@ -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
View file @
21574c3a
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment