Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
ceb76725
Commit
ceb76725
authored
Jun 03, 2008
by
Rafaël Carré
Browse files
Link with libavutil when needed
Use tabs in Makefile
parent
f9dcddd8
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
ceb76725
...
...
@@ -2925,18 +2925,19 @@ AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no"
then
PKG_CHECK_MODULES(AVCODEC,[libavcodec],
PKG_CHECK_MODULES(AVCODEC,[libavcodec
libavutil
],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h)
AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
VLC_ADD_PLUGIN([avcodec])
VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
VLC_RESTORE_FLAGS
],[
AC_MSG_ERROR([Could not find libavcodec. Use --disable-avcodec to ignore this error.])
AC_MSG_ERROR([Could not find libavcodec
or libavutil
. Use --disable-avcodec to ignore this error.])
])
fi
...
...
@@ -2948,18 +2949,19 @@ AC_ARG_ENABLE(avformat,
[ --enable-avformat libavformat containers (default enabled)])
if test "${enable_avformat}" != "no"
then
PKG_CHECK_MODULES(AVFORMAT,[libavformat],
PKG_CHECK_MODULES(AVFORMAT,[libavformat
libavutil
],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}"
AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
VLC_ADD_PLUGIN([avformat])
VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS])
VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS])
VLC_RESTORE_FLAGS
],[
AC_MSG_ERROR([Could not find libavformat. Use --disable-avformat to ignore this error.])
AC_MSG_ERROR([Could not find libavformat
or libavutil
. Use --disable-avformat to ignore this error.])
])
fi
...
...
modules/codec/ffmpeg/Modules.am
View file @
ceb76725
...
...
@@ -44,8 +44,8 @@ SOURCES_swscale = \
SOURCES_imgresample = \
imgresample.c \
imgresample.h \
chroma.c \
video_filter.c \
chroma.c \
video_filter.c \
chroma.h \
$(NULL)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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