Attachment #269111 for bug #361107

View | Details | Raw Unified | Return to bug 361107
Collapse All | Expand All

Lines 614-624 Link Here

(-)mediastreamer-2.7.3/configure.ac (-5 / +5 lines)
614	have_libv4l2=yes]	614	have_libv4l2=yes]
615	,[echo "No libv4l2 found."]	615	,[echo "No libv4l2 found."]
616	)	616	)
617	PKG_CHECK_MODULES(LIBV4L1, libv4l1,	617	# PKG_CHECK_MODULES(LIBV4L1, libv4l1,
618	[AC_DEFINE(HAVE_LIBV4L1,1,[Defined if we have libv4l1])	618	# [AC_DEFINE(HAVE_LIBV4L1,1,[Defined if we have libv4l1])
619	have_libv4l1=yes]	619	# have_libv4l1=yes]
620	,[echo "No libv4l1 found."]	620	# ,[echo "No libv4l1 found."]
621	)	621	# )
622		622
623	if test "$found_v4l" = "yes" && test "$have_libv4l2" != "yes" ; then	623	if test "$found_v4l" = "yes" && test "$have_libv4l2" != "yes" ; then
624	if test "$video" = "true" && test "$libv4l" = "yes" ; then	624	if test "$video" = "true" && test "$libv4l" = "yes" ; then

Lines 117-123 Link Here

(-)mediastreamer-2.7.3/src/Makefile.am (-1 / +1 lines)
117	endif	117	endif
118		118
119	if BUILD_V4L	119	if BUILD_V4L
120	libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c	120	libmediastreamer_la_SOURCES+=msv4l2.c
121	endif	121	endif
122		122
123	if BUILD_WIN32	123	if BUILD_WIN32

Return to bug 361107

Lines 54-60 Link Here

(-)mediastreamer-2.7.3/src/Makefile.in (-2 / +2 lines)
54	@BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c	54	@BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
55	@BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c	55	@BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
56	@BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m	56	@BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
57	@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c	57	@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
58	@BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c	58	@BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
59	@BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c	59	@BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
60	@BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \	60	@BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
Lines 135-141 Link Here
135	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \	135	audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
136	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \	136	msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
137	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \	137	msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
138	aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \	138	aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
139	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \	139	drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
140	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \	140	sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
141	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \	141	h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \