Skip to content

V
vlc-1.1
Commit c13d2637 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Replace tabs with whitespace.

parent 87232427
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 25 deletions
configure.ac
View file @ c13d2637
...@@ -2873,7 +2873,7 @@ dnl ...@@ -2873,7 +2873,7 @@ dnl
dnl ffmpeg decoder/demuxer plugin dnl ffmpeg decoder/demuxer plugin
dnl dnl
dnl we try to find ffmpeg using : 1- given tree 2- ffmpeg-config, 3- pkg-config dnl we try to find ffmpeg using : 1- given tree 2- ffmpeg-config, 3- pkg-config
dnl 4- default place, dnl 4- default place,
AC_ARG_ENABLE(ffmpeg, AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)]) [ --enable-ffmpeg ffmpeg codec (default enabled)])
...@@ -2886,14 +2886,14 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo ...@@ -2886,14 +2886,14 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
[ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
[ [
if test "$with_ffmpeg_mp3lame" = "yes"; then if test "$with_ffmpeg_mp3lame" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lmp3lame]) VLC_ADD_LIBS([ffmpeg],[-lmp3lame])
fi]) fi])
AC_ARG_WITH(ffmpeg-faac, AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
[ [
if test "$with_ffmpeg_faac" = "yes"; then if test "$with_ffmpeg_faac" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lfaac]) VLC_ADD_LIBS([ffmpeg],[-lfaac])
fi]) fi])
AC_ARG_WITH(ffmpeg-dts, AC_ARG_WITH(ffmpeg-dts,
...@@ -2932,35 +2932,35 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo ...@@ -2932,35 +2932,35 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
[ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support], [ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support],
[ [
if test "$with_ffmpeg_zlib" = "yes"; then if test "$with_ffmpeg_zlib" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lz]) VLC_ADD_LIBS([ffmpeg],[-lz])
fi]) fi])
AC_ARG_WITH(ffmpeg-amrnb, AC_ARG_WITH(ffmpeg-amrnb,
[ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support], [ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support],
[ [
if test "$with_ffmpeg_amrnb" = "yes"; then if test "$with_ffmpeg_amrnb" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lamrnb]) VLC_ADD_LIBS([ffmpeg],[-lamrnb])
fi]) fi])
AC_ARG_WITH(ffmpeg-amrwb, AC_ARG_WITH(ffmpeg-amrwb,
[ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support], [ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support],
[ [
if test "$with_ffmpeg_amrwb" = "yes"; then if test "$with_ffmpeg_amrwb" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lamrwb]) VLC_ADD_LIBS([ffmpeg],[-lamrwb])
fi]) fi])
AC_ARG_WITH(ffmpeg-x264, AC_ARG_WITH(ffmpeg-x264,
[ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support], [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support],
[ [
if test "$with_ffmpeg_x264" = "yes"; then if test "$with_ffmpeg_x264" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-lx264]) VLC_ADD_LIBS([ffmpeg],[-lx264])
fi]) fi])
AC_ARG_WITH(ffmpeg-a52, AC_ARG_WITH(ffmpeg-a52,
[ --with-ffmpeg-a52 specify if ffmpeg has been compiled with liba52 support], [ --with-ffmpeg-a52 specify if ffmpeg has been compiled with liba52 support],
[ [
if test "$with_ffmpeg_a52" = "yes"; then if test "$with_ffmpeg_a52" = "yes"; then
VLC_ADD_LIBS([ffmpeg],[-la52]) VLC_ADD_LIBS([ffmpeg],[-la52])
fi]) fi])
dnl dnl
...@@ -2986,7 +2986,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo ...@@ -2986,7 +2986,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then
VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a]) VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a])
elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then
VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a])
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}])
else else
dnl The given libavcodec wasn't built with --enable-pp dnl The given libavcodec wasn't built with --enable-pp
...@@ -2996,43 +2996,42 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo ...@@ -2996,43 +2996,42 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo
fi fi
dnl Use a custom libffmpeg dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc
PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH" PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH"
PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR" PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR"
export PKG_CONFIG_PATH="" export PKG_CONFIG_PATH=""
export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}" export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}"
PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [ PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS})
VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})]
,[]) ,[])
AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[ AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[
export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}" export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}"
],[ ],[
unset PKG_CONFIG_PATH unset PKG_CONFIG_PATH
]) ])
AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[ AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[
export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}"
],[ ],[
unset PKG_CONFIG_LIBDIR unset PKG_CONFIG_LIBDIR
]) ])
VLC_ADD_BUILTINS([ffmpeg]) VLC_ADD_BUILTINS([ffmpeg])
if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then
VLC_ADD_BUILTINS([stream_out_switcher]) VLC_ADD_BUILTINS([stream_out_switcher])
fi fi
if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then
AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.])
VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libswscale ${real_ffmpeg_tree}/libswscale/libswscale.a]) VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libswscale ${real_ffmpeg_tree}/libswscale/libswscale.a])
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libswscale]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libswscale])
fi fi
else else
dnl Look for a ffmpeg-config (we are on debian ) dnl Look for a ffmpeg-config (we are on debian )
FFMPEG_PATH="${PATH}" FFMPEG_PATH="${PATH}"
AC_ARG_WITH(ffmpeg-config-path, AC_ARG_WITH(ffmpeg-config-path,
[ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)], [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)],
...@@ -3053,7 +3052,7 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -3053,7 +3052,7 @@ dnl Look for a ffmpeg-config (we are on debian )
fi fi
VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`]) VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`])
VLC_ADD_LIBS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) VLC_ADD_LIBS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
else else
dnl Trying with pkg-config dnl Trying with pkg-config
...@@ -3096,7 +3095,7 @@ dnl Trying with pkg-config ...@@ -3096,7 +3095,7 @@ dnl Trying with pkg-config
],[ true ]) ],[ true ])
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
],[ ],[
dnl dnl
dnl last chance: at the default place dnl last chance: at the default place
dnl dnl
...@@ -3119,11 +3118,10 @@ dnl Trying with pkg-config ...@@ -3119,11 +3118,10 @@ dnl Trying with pkg-config
fi], fi],
[ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL]) [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
AC_CHECK_LIB(postproc, pp_postprocess, [ AC_CHECK_LIB(postproc, pp_postprocess, [
VLC_ADD_LIBS([ffmpeg],[-lpostproc])], VLC_ADD_LIBS([ffmpeg],[-lpostproc])],
AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]), AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]),
[$LDAVUTIL]) [$LDAVUTIL])
AC_CHECK_LIB(avformat, av_open_input_stream, [ AC_CHECK_LIB(avformat, av_open_input_stream, [
VLC_ADD_LIBS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) VLC_ADD_LIBS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL])
......
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