Link with libavutil when needed

Use tabs in Makefile

diff --git a/configure.ac b/configure.ac
index 73d1c8ef9de0953b1d092d5bece0fd762c96e49b..36e4317a49b3d436d68e75bf5100b7025b5a5ab7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2925,18 +2925,19 @@ AC_ARG_ENABLE(avcodec,
 [  --enable-avcodec       libavcodec codec (default enabled)])
 if test "${enable_avcodec}" != "no"
 then
-  PKG_CHECK_MODULES(AVCODEC,[libavcodec],
+  PKG_CHECK_MODULES(AVCODEC,[libavcodec libavutil],
     [
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
       CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
       AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h)
+      AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
       VLC_ADD_PLUGIN([avcodec])
       VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
       VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS])
       VLC_RESTORE_FLAGS
     ],[
-      AC_MSG_ERROR([Could not find libavcodec. Use --disable-avcodec to ignore this error.])
+      AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
   ])
 fi
 
@@ -2948,18 +2949,19 @@ AC_ARG_ENABLE(avformat,
 [  --enable-avformat   libavformat containers (default enabled)])
 if test "${enable_avformat}" != "no"
 then
-  PKG_CHECK_MODULES(AVFORMAT,[libavformat],
+  PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil],
     [
       VLC_SAVE_FLAGS
       CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
       CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}"
       AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
+      AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
       VLC_ADD_PLUGIN([avformat])
       VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS])
       VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS])
       VLC_RESTORE_FLAGS
     ],[
-      AC_MSG_ERROR([Could not find libavformat. Use --disable-avformat to ignore this error.])
+      AC_MSG_ERROR([Could not find libavformat or libavutil. Use --disable-avformat to ignore this error.])
   ])
 fi
 

diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index a88ab9e61a21da907429d466d097a70f07e740f9..9c136251807ab59f347d50c8a7d74a17e6f7cd54 100644 (file)
--- a/modules/codec/ffmpeg/Modules.am
+++ b/modules/codec/ffmpeg/Modules.am
@@ -44,8 +44,8 @@ SOURCES_swscale = \
 SOURCES_imgresample = \
        imgresample.c \
        imgresample.h \
-        chroma.c \
-        video_filter.c \
+       chroma.c \
+       video_filter.c \
        chroma.h \
        $(NULL)