leniate musicbrainz check; check for v4l-conf before calling it

Original commit message from CVS:
leniate musicbrainz check; check for v4l-conf before calling it
This commit is contained in:
Thomas Vander Stichele 2004-06-01 12:10:37 +00:00
parent c995758d6a
commit ef8e1dd30a
3 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2004-06-01 Thomas Vander Stichele <thomas at apestaart dot org>
* sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
check if v4l-conf is in path
2004-06-01 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/gst/media-info/media-info-priv.c: (gmi_set_mime):

2
common

@ -1 +1 @@
Subproject commit 6e6d3f154c84195e9d505e114ea4a2df216f7277
Subproject commit cf0828313f7cea4d5840c0959e9113f13309a56f

View file

@ -1340,9 +1340,10 @@ main (int argc,
dnl *** musicbrainz ***
dnl libmusicbrainz <= 2.0.2 has symbol clashes with ffmpeg
dnl however, our ffmpeg patch was accepted upstream
translit(dnm, m, l) AM_CONDITIONAL(USE_MUSICBRAINZ, true)
GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz], musicbrainz, [
PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz > 2.0.2,
PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= 2.0.2,
HAVE_MUSICBRAINZ="yes", HAVE_MUSICBRAINZ="no")
AC_SUBST(MUSICBRAINZ_CFLAGS)
AC_SUBST(MUSICBRAINZ_LIBS)