Skip to content

V
vlc
Commit a81518d6 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Disable avformat if avcodec is disabled

parent 393a1b33
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
configure.ac
View file @ a81518d6
...@@ -2626,8 +2626,7 @@ dnl avcodec decoder/encoder plugin ...@@ -2626,8 +2626,7 @@ dnl avcodec decoder/encoder plugin
dnl dnl
AC_ARG_ENABLE(avcodec, AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)]) [ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no" AS_IF([test "${enable_avcodec}" != "no"], [
then
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil], PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil],
[ [
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
...@@ -2643,7 +2642,9 @@ then ...@@ -2643,7 +2642,9 @@ then
],[ ],[
AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.]) AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
]) ])
fi ], [
have_avcodec="no"
])
dnl dnl
dnl libva needs avcodec dnl libva needs avcodec
...@@ -2735,7 +2736,9 @@ dnl avformat demuxer/muxer plugin ...@@ -2735,7 +2736,9 @@ dnl avformat demuxer/muxer plugin
dnl dnl
AC_ARG_ENABLE(avformat, AC_ARG_ENABLE(avformat,
[ --enable-avformat libavformat containers (default enabled)]) [ --enable-avformat libavformat containers (default enabled)],, [
enable_avformat="${have_avcodec}"
])
if test "${enable_avformat}" != "no" if test "${enable_avformat}" != "no"
then then
PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavutil], PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavutil],
......
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