FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge back from release

Browse Source 
Original commit message from CVS:
merge back from release
This commit is contained in:
Thomas Vander Stichele 2003-01-08 16:41:27 +00:00
parent 616b2b2bd7
commit 59a7287480
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -529,12 +529,13 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
AC_MSG_NOTICE(slurping FFmpeg CVS source) AC_MSG_NOTICE(slurping FFmpeg CVS source)
AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2002-12-14 12:00 GMT, AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2002-12-14 12:00 GMT,
HAVE_FFMPEG=yes, HAVE_FFMPEG=no) HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
[defined if we use uninstalled ffmpeg])
else else
AC_MSG_NOTICE(FFmpeg CVS code should be included already) AC_MSG_NOTICE(FFmpeg CVS code should be included already)
HAVE_FFMPEG=yes HAVE_FFMPEG=yes
fi fi
# we only bother with uninstalled (included) ffmpeg for now
AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
[defined if we use uninstalled ffmpeg])
]) ])
dnl *** Gnome VFS *** dnl *** Gnome VFS ***

9
gst-libs/ext/ffmpeg/Makefile.am
View File

@ -3,7 +3,13 @@ EXTRA_DIST = Tag
# this doesn't trigger the distdir target in the ffmpeg checkout # this doesn't trigger the distdir target in the ffmpeg checkout
DIST_SUBDIRS = DIST_SUBDIRS =
SUBDIRS = ffmpeg if USE_FFMPEG
FFMPEG_DIR=ffmpeg
else
FFMPEG_DIR=
endif
SUBDIRS = $(FFMPEG_DIR)
DISTFILES = \ DISTFILES = \
ffmpeg/Changelog \ ffmpeg/Changelog \
@ -16,6 +22,7 @@ DISTFILES = \
ffmpeg/configure \ ffmpeg/configure \
ffmpeg/Makefile \ ffmpeg/Makefile \
ffmpeg/cygwin_inttypes.h \ ffmpeg/cygwin_inttypes.h \
ffmpeg/ffserver.h \
ffmpeg/ffmpeg.c \ ffmpeg/ffmpeg.c \
ffmpeg/ffserver.c \ ffmpeg/ffserver.c \
ffmpeg/berrno.h \ ffmpeg/berrno.h \