Commit fbe65af6 authored by Sam Hocevar's avatar Sam Hocevar

* ./plugins/avi, ./plugins/ffmpeg: created empty directories for fenrir's

    upcoming work.
parent 69c174d7
......@@ -20,6 +20,7 @@ PLUGINS_DIR := a52 \
access \
alsa \
arts \
avi \
beos \
chroma \
directx \
......@@ -30,6 +31,7 @@ PLUGINS_DIR := a52 \
dvdread \
esd \
fb \
ffmpeg \
filter \
fx \
ggi \
......@@ -69,6 +71,7 @@ PLUGINS_TARGETS := a52/a52 \
access/http \
alsa/alsa \
arts/arts \
avi/avi \
beos/beos \
chroma/chroma_i420_rgb \
chroma/chroma_i420_rgb_mmx \
......@@ -89,6 +92,7 @@ PLUGINS_TARGETS := a52/a52 \
dvdread/dvdread \
esd/esd \
fb/fb \
ffmpeg/ffmpeg \
filter/filter_deinterlace \
filter/filter_transform \
filter/filter_invert \
......
......@@ -75,6 +75,7 @@ dvd_CFLAGS = @dvd_CFLAGS@
dvdread_CFLAGS = @dvdread_CFLAGS@
directx_CFLAGS = @directx_CFLAGS@
esd_CFLAGS = @esd_CFLAGS@
ffmpeg_CFLAGS = @ffmpeg_CFLAGS@
glide_CFLAGS = @glide_CFLAGS@
gnome_CFLAGS = @gnome_CFLAGS@
gtk_CFLAGS = @gtk_CFLAGS@
......@@ -108,6 +109,7 @@ dvd_LDFLAGS = @dvd_LDFLAGS@
dvdread_LDFLAGS = @dvdread_LDFLAGS@
esd_LDFLAGS = @esd_LDFLAGS@
filter_distort_LDFLAGS = @filter_distort_LDFLAGS@
ffmpeg_LDFLAGS = @ffmpeg_LDFLAGS@
ggi_LDFLAGS = @ggi_LDFLAGS@
glide_LDFLAGS = @glide_LDFLAGS@
gnome_LDFLAGS = @gnome_LDFLAGS@
......
This diff is collapsed.
......@@ -719,6 +719,16 @@ dnl ipv6 plugin
dnl
AC_CHECK_FUNC(inet_pton,[PLUGINS="${PLUGINS} ipv6"])
dnl
dnl AVI demux plugin
dnl
AC_ARG_ENABLE(avi,
[ --enable-avi AVI demux module (default enabled)])
if test x$enable_avi != xno
then
PLUGINS="${PLUGINS} avi"
fi
dnl
dnl Codec plugins
dnl
......@@ -757,6 +767,43 @@ then
LDFLAGS=$save_LDFLAGS
fi
dnl
dnl ffmpeg decoder plugin
dnl
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default disabled)])
if test "x$enableval" = "xyes"
then
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
if test "x$with_ffmpeg_tree" = x
then
AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
else
AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree})
real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`"
if test "x$real_ffmpeg_tree" = x
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}])
fi
if test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"
then
dnl Use a custom libffmpeg
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
BUILTINS="${BUILTINS} ffmpeg"
ffmpeg_LDFLAGS="${ffmpeg_LDFLAGS} ${real_ffmpeg_tree}/libavcodec/libavcodec.a"
ffmpeg_CFLAGS="${ffmpeg_CFLAGS} -I${real_ffmpeg_tree}/libavcodec"
else
dnl The given libavcodec wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}])
fi
fi
fi
dnl special case for BeOS
if test x$SYS = xbeos
then
......@@ -1458,6 +1505,7 @@ AC_SUBST(dvd_CFLAGS)
AC_SUBST(dvdread_CFLAGS)
AC_SUBST(directx_CFLAGS)
AC_SUBST(esd_CFLAGS)
AC_SUBST(ffmpeg_CFLAGS)
AC_SUBST(glide_CFLAGS)
AC_SUBST(gnome_CFLAGS)
AC_SUBST(gtk_CFLAGS)
......@@ -1488,6 +1536,7 @@ AC_SUBST(dvd_LDFLAGS)
AC_SUBST(dvdread_LDFLAGS)
AC_SUBST(esd_LDFLAGS)
AC_SUBST(filter_distort_LDFLAGS)
AC_SUBST(ffmpeg_LDFLAGS)
AC_SUBST(ggi_LDFLAGS)
AC_SUBST(glide_LDFLAGS)
AC_SUBST(gnome_LDFLAGS)
......
*.bak
.dep
*.lo
*.o.*
*.lo.*
*.bak
.dep
*.lo
*.o.*
*.lo.*
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