mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

slurp in ffmpeg a) please test b) please help me figure out how to portably link in a .a file in our .so plugin

Browse source 
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
This commit is contained in:
Thomas Vander Stichele 2002-12-26 10:53:21 +00:00
parent 4e1449bb3d
commit a0646013c2
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
autogen.sh
View file

@ -13,6 +13,9 @@ then
cvs co common cvs co common
fi fi
# ensure that we have the dirs we put ext libs in to appease automake
mkdir -p gst-libs/ext/ffmpeg
# source helper functions # source helper functions
if test ! -e common/gst-autogen.sh; if test ! -e common/gst-autogen.sh;
then then

2
common

@ -1 +1 @@
Subproject commit 79e6940e7ff1a6cbf959a1f7a0a3d1ed3f90d3ee Subproject commit 4a7bc52a893bdd9fefa9fabe460c827822a9e0f2

9
configure.ac
View file

@ -207,6 +207,7 @@ GTK_LIBS=$GTK2_LIBS
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
dnl Check for X11 extensions dnl Check for X11 extensions
AC_PATH_XTRA AC_PATH_XTRA
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
@ -522,7 +523,10 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
dnl *** FFMPEG *** dnl *** FFMPEG ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true) translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [ 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])
]) ])
dnl *** Gnome VFS *** dnl *** Gnome VFS ***
@ -1089,6 +1093,8 @@ gst-libs/gst/play/Makefile
gst-libs/gst/resample/Makefile gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile gst-libs/gst/riff/Makefile
gst-libs/gst/video/Makefile gst-libs/gst/video/Makefile
gst-libs/ext/Makefile
gst-libs/ext/ffmpeg/Makefile
examples/dynparams/Makefile examples/dynparams/Makefile
examples/capsfilter/Makefile examples/capsfilter/Makefile
examples/seeking/Makefile examples/seeking/Makefile
@ -1100,7 +1106,6 @@ testsuite/Makefile
tools/Makefile tools/Makefile
gconf/Makefile gconf/Makefile
) )
AC_OUTPUT AC_OUTPUT
echo -e "configure: *** Plug-ins that will be built : $GST_PLUGINS_YES" echo -e "configure: *** Plug-ins that will be built : $GST_PLUGINS_YES"

4
gst-libs/Makefile.am
View file

@ -1,3 +1 @@
SUBDIRS = gst SUBDIRS = gst ext
DIST_SUBDIRS = gst

2
m4/as-ffmpeg.m4
View file

@ -18,7 +18,7 @@ AC_DEFUN(AM_PATH_FFMPEG,
AC_ARG_WITH(ffmpeg-source, AC_ARG_WITH(ffmpeg-source,
AC_HELP_STRING([--with-ffmpeg-source=DIR], AC_HELP_STRING([--with-ffmpeg-source=DIR],
[Directory where FFmpeg source is (optional)]), [Directory where FFmpeg source is (optional)]),
ffmpeg_source="$withval", ffmpeg_source="") ffmpeg_source="$withval")
dnl save CFLAGS and LIBS here dnl save CFLAGS and LIBS here
CFLAGS_save=$CFLAGS CFLAGS_save=$CFLAGS