merge back from release
Original commit message from CVS: merge back from release
This commit is contained in:
parent
85ad491b51
commit
e116d85341
@ -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 ***
|
||||||
|
Loading…
x
Reference in New Issue
Block a user