Commit 6ceccc7d authored by Rémi Duraffort's avatar Rémi Duraffort

stream_out siwtcher needs avcodec (fix missing symbols).

parent 9c2b79c8
...@@ -1707,12 +1707,6 @@ AS_IF([test "${enable_sout}" != "no"], [ ...@@ -1707,12 +1707,6 @@ AS_IF([test "${enable_sout}" != "no"], [
]) ])
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
AC_ARG_ENABLE(switcher,
[ --enable-switcher Stream-out switcher plugin (default disabled)])
AS_IF([test "${enable_switcher}" = "yes"], [
VLC_ADD_PLUGIN([stream_out_switcher])
])
dnl Check for libshout dnl Check for libshout
AC_ARG_ENABLE(shout, AC_ARG_ENABLE(shout,
[ --enable-shout libshout output plugin (default disabled)]) [ --enable-shout libshout output plugin (default disabled)])
...@@ -3008,11 +3002,27 @@ then ...@@ -3008,11 +3002,27 @@ then
VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
have_avcodec="yes"
],[ ],[
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 fi
dnl
dnl stream_out switcher needs libavcodec
dnl
AC_ARG_ENABLE(switcher,
[ --enable-switcher Stream-out switcher plugin (default disabled)])
AS_IF([test "${enable_switcher}" = "yes"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [
VLC_ADD_PLUGIN([stream_out_switcher])
VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS])
VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS])
],[AC_MSG_ERROR([Stream_out switcher depends on avcodec])
])
])
dnl dnl
dnl avformat demuxer/muxer plugin dnl avformat demuxer/muxer plugin
dnl dnl
......
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