Original commit message from CVS:
slurp in ffmpeg
a) please test
b) please help me figure out how to portably link in a .a file in our
.so plugin
+# ensure that we have the dirs we put ext libs in to appease automake
+mkdir -p gst-libs/ext/ffmpeg
+
# source helper functions
if test ! -e common/gst-autogen.sh;
then
# source helper functions
if test ! -e common/gst-autogen.sh;
then
-Subproject commit 79e6940e7ff1a6cbf959a1f7a0a3d1ed3f90d3ee
+Subproject commit 4a7bc52a893bdd9fefa9fabe460c827822a9e0f2
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
dnl Check for X11 extensions
AC_PATH_XTRA
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
dnl Check for X11 extensions
AC_PATH_XTRA
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
dnl *** FFMPEG ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
dnl *** FFMPEG ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
- AM_PATH_FFMPEG(0.4.6, HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
+ AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, "2002-12-14 12:00 GMT",
+ HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
+ AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
+ [defined if we use uninstalled ffmpeg])
gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile
gst-libs/gst/video/Makefile
gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile
gst-libs/gst/video/Makefile
+gst-libs/ext/Makefile
+gst-libs/ext/ffmpeg/Makefile
examples/dynparams/Makefile
examples/capsfilter/Makefile
examples/seeking/Makefile
examples/dynparams/Makefile
examples/capsfilter/Makefile
examples/seeking/Makefile
tools/Makefile
gconf/Makefile
)
tools/Makefile
gconf/Makefile
)
AC_OUTPUT
echo -e "configure: *** Plug-ins that will be built : $GST_PLUGINS_YES"
AC_OUTPUT
echo -e "configure: *** Plug-ins that will be built : $GST_PLUGINS_YES"
-SUBDIRS = gst
-
-DIST_SUBDIRS = gst
AC_ARG_WITH(ffmpeg-source,
AC_HELP_STRING([--with-ffmpeg-source=DIR],
[Directory where FFmpeg source is (optional)]),
AC_ARG_WITH(ffmpeg-source,
AC_HELP_STRING([--with-ffmpeg-source=DIR],
[Directory where FFmpeg source is (optional)]),
- ffmpeg_source="$withval", ffmpeg_source="")
+ ffmpeg_source="$withval")
dnl save CFLAGS and LIBS here
CFLAGS_save=$CFLAGS
dnl save CFLAGS and LIBS here
CFLAGS_save=$CFLAGS