Skip to content

V
vlc
Commit 1f227ac5 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Back ports [17361] and [17362] 

Closes #815
parent eb8b6be7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
configure.ac
View file @ 1f227ac5
...@@ -2631,10 +2631,10 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2631,10 +2631,10 @@ dnl Look for a ffmpeg-config (we are on debian )
AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH}) AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH})
if test "${FFMPEG_CONFIG}" != "no" if test "${FFMPEG_CONFIG}" != "no"
then then
AC_CHECK_HEADERS(ffmpeg/avcodec.h) AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h) AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
VLC_ADD_PLUGINS([ffmpeg]) VLC_ADD_PLUGINS([ffmpeg])
if test "${enable_sout}" != "no"; then if test "${enable_sout}" != "no"; then
VLC_ADD_PLUGINS([stream_out_switcher]) VLC_ADD_PLUGINS([stream_out_switcher])
...@@ -2647,10 +2647,10 @@ dnl Look for a ffmpeg-config (we are on debian ) ...@@ -2647,10 +2647,10 @@ dnl Look for a ffmpeg-config (we are on debian )
dnl Trying with pkg-config dnl Trying with pkg-config
PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
[ [
AC_CHECK_HEADERS(ffmpeg/avcodec.h) AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avformat.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h) AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
if test "${SYS}" = "darwin"; then if test "${SYS}" = "darwin"; then
VLC_ADD_BUILTINS([ffmpeg]) VLC_ADD_BUILTINS([ffmpeg])
else else
......
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