mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
Some bugfixes:
Original commit message from CVS: Some bugfixes: - Add missing .h file to videoscale disting - Remove http plugin from build
This commit is contained in:
parent
8991e57614
commit
4f03b7c098
4 changed files with 21 additions and 21 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit ed429334bba35b10172ba97d9b3795b75a65b388
|
Subproject commit c5d7301d645fbee2881c30e86152cb3d2152e33b
|
36
configure.ac
36
configure.ac
|
@ -638,23 +638,23 @@ GST_CHECK_FEATURE(HERMES, [Hermes library], colorspace, [
|
||||||
], AC_SUBST(HERMES_LIBS))
|
], AC_SUBST(HERMES_LIBS))
|
||||||
|
|
||||||
dnl *** http ***
|
dnl *** http ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_HTTP, true)
|
dnl translit(dnm, m, l) AM_CONDITIONAL(USE_HTTP, true)
|
||||||
GST_CHECK_FEATURE(HTTP, [http plug-ins], gsthttpsrc, [
|
dnl GST_CHECK_FEATURE(HTTP, [http plug-ins], gsthttpsrc, [
|
||||||
dnl FIXME: need to check for header
|
dnl dnl FIXME: need to check for header
|
||||||
GHTTP_LIBS=
|
dnl GHTTP_LIBS=
|
||||||
GST_HTTPSRC_GET_TYPE=
|
dnl GST_HTTPSRC_GET_TYPE=
|
||||||
if test x$USE_GLIB2 = xyes; then
|
dnl if test x$USE_GLIB2 = xyes; then
|
||||||
AC_MSG_WARN(ghttp disabled for glib2.0)
|
dnl AC_MSG_WARN(ghttp disabled for glib2.0)
|
||||||
else
|
dnl else
|
||||||
AC_CHECK_LIB(ghttp, ghttp_request_new,
|
dnl AC_CHECK_LIB(ghttp, ghttp_request_new,
|
||||||
[HTTP_LIBS="-lghttp"
|
dnl [HTTP_LIBS="-lghttp"
|
||||||
GST_HTTPSRC_GET_TYPE="gst_httpsrc_get_type"
|
dnl GST_HTTPSRC_GET_TYPE="gst_httpsrc_get_type"
|
||||||
HAVE_HTTP=yes
|
dnl HAVE_HTTP=yes
|
||||||
], :, $LIBS)
|
dnl ], :, $LIBS)
|
||||||
fi
|
dnl fi
|
||||||
AC_SUBST(HTTP_LIBS)
|
dnl AC_SUBST(HTTP_LIBS)
|
||||||
AC_SUBST(GST_HTTPSRC_GET_TYPE)
|
dnl AC_SUBST(GST_HTTPSRC_GET_TYPE)
|
||||||
])
|
dnl ])
|
||||||
|
|
||||||
dnl *** ivorbis ***
|
dnl *** ivorbis ***
|
||||||
dnl AM_PATH_IVORBIS only takes two options
|
dnl AM_PATH_IVORBIS only takes two options
|
||||||
|
@ -1170,7 +1170,7 @@ ext/flac/Makefile
|
||||||
ext/gnomevfs/Makefile
|
ext/gnomevfs/Makefile
|
||||||
ext/gsm/Makefile
|
ext/gsm/Makefile
|
||||||
ext/hermes/Makefile
|
ext/hermes/Makefile
|
||||||
ext/http/Makefile
|
dnl ext/http/Makefile
|
||||||
ext/jack/Makefile
|
ext/jack/Makefile
|
||||||
ext/jpeg/Makefile
|
ext/jpeg/Makefile
|
||||||
ext/ladspa/Makefile
|
ext/ladspa/Makefile
|
||||||
|
|
|
@ -276,7 +276,7 @@ DIST_SUBDIRS=\
|
||||||
audiofile cdparanoia divx dv \
|
audiofile cdparanoia divx dv \
|
||||||
dvdread dvdnav esd mas ffmpeg \
|
dvdread dvdnav esd mas ffmpeg \
|
||||||
flac gnomevfs gsm \
|
flac gnomevfs gsm \
|
||||||
hermes http ivorbis jack jpeg \
|
hermes ivorbis jack jpeg \
|
||||||
ladspa lame lcs libfame libpng \
|
ladspa lame lcs libfame libpng \
|
||||||
mad mikmod mjpegtools mpeg2dec \
|
mad mikmod mjpegtools mpeg2dec \
|
||||||
openquicktime raw1394 \
|
openquicktime raw1394 \
|
||||||
|
|
|
@ -18,4 +18,4 @@ libgstvideoscale_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finl
|
||||||
libgstvideoscale_la_LIBADD =
|
libgstvideoscale_la_LIBADD =
|
||||||
libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
noinst_HEADERS = gstvideoscale.h videoscale_x86.h
|
noinst_HEADERS = gstvideoscale.h videoscale_x86.h videoscale.h
|
||||||
|
|
Loading…
Reference in a new issue