mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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 31e3fb26a7
commit 7fc0c37a08
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
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> 2004-06-01 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/gst/media-info/media-info-priv.c: (gmi_set_mime): * gst-libs/gst/media-info/media-info-priv.c: (gmi_set_mime):

2
common

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

3
configure.ac
View file

@ -1340,9 +1340,10 @@ main (int argc,
dnl *** musicbrainz *** dnl *** musicbrainz ***
dnl libmusicbrainz <= 2.0.2 has symbol clashes with ffmpeg 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) translit(dnm, m, l) AM_CONDITIONAL(USE_MUSICBRAINZ, true)
GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz], musicbrainz, [ 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") HAVE_MUSICBRAINZ="yes", HAVE_MUSICBRAINZ="no")
AC_SUBST(MUSICBRAINZ_CFLAGS) AC_SUBST(MUSICBRAINZ_CFLAGS)
AC_SUBST(MUSICBRAINZ_LIBS) AC_SUBST(MUSICBRAINZ_LIBS)

10
sys/v4l/v4l-overlay_calls.c
View file

@ -47,6 +47,7 @@ gboolean
gst_v4l_set_overlay (GstV4lElement * v4lelement) gst_v4l_set_overlay (GstV4lElement * v4lelement)
{ {
gchar *buff; gchar *buff;
gchar *path;
if (v4lelement->display) if (v4lelement->display)
g_free (v4lelement->display); g_free (v4lelement->display);
@ -59,6 +60,15 @@ gst_v4l_set_overlay (GstV4lElement * v4lelement)
return FALSE; return FALSE;
/* start v4l-conf */ /* start v4l-conf */
path = g_find_program_in_path ("v4l-conf");
if (!path) {
GST_ELEMENT_ERROR (v4lelement, RESOURCE, FAILED,
(_("Program 'v4l-conf' missing from path.")),
("Cannot set XVideo overlay mode."));
return FALSE;
}
g_free (path);
buff = g_strdup_printf ("v4l-conf -q -c %s -d %s 2> /dev/null", buff = g_strdup_printf ("v4l-conf -q -c %s -d %s 2> /dev/null",
v4lelement->videodev, v4lelement->display); v4lelement->videodev, v4lelement->display);