From 6d6522e72f030f9db9524510d79aaa0711a8d2ac Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 1 Jun 2004 12:10:37 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ common | 2 +- configure.ac | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b51b3fc..354641b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-06-01 Thomas Vander Stichele + * sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay): + check if v4l-conf is in path + +2004-06-01 Thomas Vander Stichele + * gst-libs/gst/media-info/media-info-priv.c: (gmi_set_mime): change assert to a more readable error message diff --git a/common b/common index 6e6d3f1..cf08283 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6e6d3f154c84195e9d505e114ea4a2df216f7277 +Subproject commit cf0828313f7cea4d5840c0959e9113f13309a56f diff --git a/configure.ac b/configure.ac index 9ea9098..0fb8376 100644 --- a/configure.ac +++ b/configure.ac @@ -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) -- 2.7.4