Merge branch 'hydro-devel' of github.com:bosch-ros-pkg/usb_cam

ros-drivers · Jul 28, 2014 · 37603b9 · 37603b9
2 parents 86f6bc3 + ae7dcd9
commit 37603b9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,6 @@ find_package(catkin
 		roscpp 
 		std_msgs 
 		sensor_msgs 
-		self_test
         camera_info_manager)
 
 
@@ -25,7 +24,6 @@ catkin_package(
 		roscpp 
 		std_msgs 
 		sensor_msgs
-		self_test
         camera_info_manager
 )
 

diff --git a/nodes/usb_cam_node.cpp b/nodes/usb_cam_node.cpp
@@ -39,7 +39,7 @@
 #include <ros/ros.h>
 #include <sensor_msgs/fill_image.h>
 #include <usb_cam/usb_cam.h>
-#include <self_test/self_test.h>
+//#include <self_test/self_test.h>
 #include <image_transport/image_transport.h>
 
 #include <camera_info_manager/camera_info_manager.h>

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>usb_cam</name>
-  <version>0.1.3</version>
+  <version>0.1.4</version>
   <description>A generic driver for USB camera that are supported by V4L</description>
 
   <license>BSD</license>
@@ -18,15 +18,13 @@
   <build_depend>roscpp</build_depend> 
   <build_depend>std_msgs</build_depend> 
   <build_depend>sensor_msgs</build_depend> 
-  <build_depend>self_test</build_depend> 
   <build_depend>ffmpeg</build_depend>
   <build_depend>camera_info_manager</build_depend>
 
   <run_depend>image_transport</run_depend> 
   <run_depend>roscpp</run_depend> 
   <run_depend>std_msgs</run_depend> 
   <run_depend>sensor_msgs</run_depend> 
-  <run_depend>self_test</run_depend> 
   <run_depend>ffmpeg</run_depend>
   <run_depend>camera_info_manager</run_depend>
 

diff --git a/src/usb_cam.cpp b/src/usb_cam.cpp
@@ -54,6 +54,7 @@ extern "C" {
 #include <linux/videodev2.h>
 #include <libavcodec/avcodec.h>
 #include <libswscale/swscale.h>
+#include <libavutil/mem.h>
 }
 
 #include <ros/ros.h>