mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-22 15:18:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix for 151236

Browse source 
Original commit message from CVS:
fix for 151236
This commit is contained in:
Thomas Vander Stichele 2004-08-30 10:26:52 +00:00
parent 2cf60029a1
commit 5daae06745
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,5 +1,15 @@
2004-08-30 Thomas Vander Stichele <thomas at apestaart dot org> 2004-08-30 Thomas Vander Stichele <thomas at apestaart dot org>
Patch by: David Schleef
* configure.ac:
* sys/Makefile.am:
rename our detection macro for V4L2. Fixes #151236.
2004-08-30 Thomas Vander Stichele <thomas at apestaart dot org>
Patch by: David Schleef
* configure.ac: * configure.ac:
check to define LAMEPRESET. Fixes #151232. check to define LAMEPRESET. Fixes #151232.

10
configure.ac
View file

@ -675,8 +675,8 @@ GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [
dnl *** Video 4 Linux 2 *** dnl *** Video 4 Linux 2 ***
dnl for information about the header/define, see sys/v4l2/gstv4l2element.h dnl for information about the header/define, see sys/v4l2/gstv4l2element.h
translit(dnm, m, l) AM_CONDITIONAL(USE_V4L2, true) translit(dnm, m, l) AM_CONDITIONAL(USE_V4L2, true)
GST_CHECK_FEATURE(V4L2, [Video 4 Linux 2], v4l2src, [ GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [
HAVE_V4L2="no" HAVE_GST_V4L2="no"
if test "$HAVE_X" = "yes" if test "$HAVE_X" = "yes"
then then
AC_MSG_CHECKING([Checking for uptodate v4l2 installation]) AC_MSG_CHECKING([Checking for uptodate v4l2 installation])
@ -690,15 +690,15 @@ GST_CHECK_FEATURE(V4L2, [Video 4 Linux 2], v4l2src, [
#endif #endif
], [ ], [
return 0; return 0;
], [ HAVE_V4L2="yes" && AC_MSG_RESULT(yes)], ], [ HAVE_GST_V4L2="yes" && AC_MSG_RESULT(yes)],
[ HAVE_V4L2="no" && AC_MSG_RESULT(no) && [ HAVE_GST_V4L2="no" && AC_MSG_RESULT(no) &&
AC_CHECK_HEADER(linux/videodev2.h, AC_CHECK_HEADER(linux/videodev2.h,
[ AC_MSG_WARN([video4linux2 headers were found, but they're old. Please update v4l2 to compile the v4l2 plugins])], [ AC_MSG_WARN([video4linux2 headers were found, but they're old. Please update v4l2 to compile the v4l2 plugins])],
[ AC_MSG_WARN([video4linux2 was not found])]) [ AC_MSG_WARN([video4linux2 was not found])])
]) ])
fi fi
dnl check for missing v4l2_buffer declaration (see #135919) dnl check for missing v4l2_buffer declaration (see #135919)
if [ test x$HAVE_V4L2 = xyes ]; then if [ test x$HAVE_GST_V4L2 = xyes ]; then
MISSING_DECL=0 MISSING_DECL=0
AC_MSG_CHECKING(struct v4l2_buffer declaration) AC_MSG_CHECKING(struct v4l2_buffer declaration)
AC_TRY_COMPILE([ AC_TRY_COMPILE([

2
sys/Makefile.am
View file

@ -40,7 +40,7 @@ else
V4L_DIR= V4L_DIR=
endif endif
if USE_V4L2 if USE_GST_V4L2
V4L2_DIR=v4l2 V4L2_DIR=v4l2
else else
V4L2_DIR= V4L2_DIR=