|
From: libvidcap c. <lib...@li...> - 2009-10-01 18:41:37
|
Revision: 100
http://libvidcap.svn.sourceforge.net/libvidcap/?rev=100&view=rev
Author: bcholew
Date: 2009-10-01 18:41:23 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
sync with trunk (revs 97, 98)
Modified Paths:
--------------
branches/framesize_enhancements/configure.ac
branches/framesize_enhancements/examples/Makefile.am
branches/framesize_enhancements/examples/vidcapTester/GrabberManager.h
branches/framesize_enhancements/examples/vidcapTester/vidcapTester.cpp
branches/framesize_enhancements/vidcap.pc.in
Modified: branches/framesize_enhancements/configure.ac
===================================================================
--- branches/framesize_enhancements/configure.ac 2009-09-30 14:17:38 UTC (rev 99)
+++ branches/framesize_enhancements/configure.ac 2009-10-01 18:41:23 UTC (rev 100)
@@ -61,6 +61,7 @@
if test "x$have_quicktime" = "xyes"; then
AC_DEFINE(HAVE_QUICKTIME, [], [quicktime headers present])
+ LIBS="-framework Carbon -framework QuartzCore -framework QuickTime"
fi
if test "x$have_directshow" = "xyes"; then
Modified: branches/framesize_enhancements/examples/Makefile.am
===================================================================
--- branches/framesize_enhancements/examples/Makefile.am 2009-09-30 14:17:38 UTC (rev 99)
+++ branches/framesize_enhancements/examples/Makefile.am 2009-10-01 18:41:23 UTC (rev 100)
@@ -9,11 +9,4 @@
simplegrab_SOURCES = simplegrab.c
-if HAVE_QUICKTIME
-AM_LDFLAGS += \
- -framework Carbon \
- -framework QuartzCore \
- -framework QuickTime
-endif
-
EXTRA_DIST = vidcapTester
Modified: branches/framesize_enhancements/examples/vidcapTester/GrabberManager.h
===================================================================
--- branches/framesize_enhancements/examples/vidcapTester/GrabberManager.h 2009-09-30 14:17:38 UTC (rev 99)
+++ branches/framesize_enhancements/examples/vidcapTester/GrabberManager.h 2009-10-01 18:41:23 UTC (rev 100)
@@ -27,7 +27,7 @@
void rescanDevices();
private:
- typedef struct mySourceContext
+ struct mySourceContext
{
Grabber * grabber;
MainWindow * window;
Modified: branches/framesize_enhancements/examples/vidcapTester/vidcapTester.cpp
===================================================================
--- branches/framesize_enhancements/examples/vidcapTester/vidcapTester.cpp 2009-09-30 14:17:38 UTC (rev 99)
+++ branches/framesize_enhancements/examples/vidcapTester/vidcapTester.cpp 2009-10-01 18:41:23 UTC (rev 100)
@@ -1,3 +1,4 @@
+#include <cstdlib>
#include <stdexcept>
#include <QApplication>
@@ -109,7 +110,7 @@
}
catch ( const std::runtime_error & e )
{
- qCritical(e.what());
+ qCritical("%s", e.what());
usage();
return 1;
}
Modified: branches/framesize_enhancements/vidcap.pc.in
===================================================================
--- branches/framesize_enhancements/vidcap.pc.in 2009-09-30 14:17:38 UTC (rev 99)
+++ branches/framesize_enhancements/vidcap.pc.in 2009-10-01 18:41:23 UTC (rev 100)
@@ -6,7 +6,7 @@
Name: vidcap
Description: Cross-platform video capture library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lvidcap @PTHREAD_LIBS@
+Libs: -L${libdir} -lvidcap @LIBS@ @PTHREAD_LIBS@
Libs.private:
Cflags: -I${includedir}
Requires.private: @PKG_REQUIRES@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|