Skip to content

V
vlc
Commit c860e783 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* backport of [11224] to 0.8.2

parent 8e6a74ec
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
configure.ac
View file @ c860e783
...@@ -2042,7 +2042,7 @@ then ...@@ -2042,7 +2042,7 @@ then
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
AC_CHECK_LIB(avcodec, avcodec_init, [ AC_CHECK_LIB(avcodec, avcodec_init, [
VLC_ADD_BUILTINS([ffmpeg]) VLC_ADD_BUILTINS([ffmpeg])
VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[-lavcodec]) VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
if test "${enable_sout}" != "no"; then if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher]) VLC_ADD_BUILTINS([stream_out_switcher])
fi], fi],
...@@ -2113,8 +2113,8 @@ then ...@@ -2113,8 +2113,8 @@ then
if test "${enable_sout}" != "no"; then if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher]) VLC_ADD_BUILTINS([stream_out_switcher])
fi fi
VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a]) VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec]) VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec])
if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.]) AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.])
......
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