diff --git a/src/video/V4L/Capture.cpp b/src/video/V4L/Capture.cpp index ae399a3a6d5c2ecbacc0af2d0b4c2144275a9ffe..b0dcaf29e4e41954a91f942f34eaed5c29ebbc92 100644 --- a/src/video/V4L/Capture.cpp +++ b/src/video/V4L/Capture.cpp @@ -7,7 +7,7 @@ Capture::~Capture(){} - void Capture::nextCaptureMode(){} + bool Capture::nextCaptureMode(){} bool Capture::forceCaptureMode(int captModePos){ diff --git a/src/video/V4L/Capture.h b/src/video/V4L/Capture.h index 2f286ef96ac0377c618d8aba6e828bb8eca4ddd1..e67445cd406e04ac316dda185e2f416ce7188a22 100644 --- a/src/video/V4L/Capture.h +++ b/src/video/V4L/Capture.h @@ -1,9 +1,14 @@ /* Generated by Together */ #ifndef CAPTURE_H -#define CAPTURE_H +#define CAPTURE_H + +#include <vector> + +#include "CaptureMode.h" #include "Command.h" - + +using namespace std; //! Capture /*! * This class is used to get a capture from the video device @@ -79,7 +84,7 @@ private: * @supplierCardinality 1..* */ //! Vector of pointers to the CaptureModes to use - Vector<CaptureMode*> captureModesVector; + vector<CaptureMode*> captureModesVector; }; #endif //CAPTURE_H diff --git a/src/video/VideoCodecDescriptor.h b/src/video/VideoCodecDescriptor.h index ac705a3ede017f8f8e83848e9d265f1d7d0ab6a0..d76c6a2978fc86eedc8b8fa4360213b5c0560e95 100644 --- a/src/video/VideoCodecDescriptor.h +++ b/src/video/VideoCodecDescriptor.h @@ -13,7 +13,11 @@ #define VIDEOCODECDESCRIPTOR_H #include <map> #include <vector> -#include "/usr/include/ffmpeg/avcodec.h" +#include <string> +//#include "/usr/include/ffmpeg/avcodec.h" +#include <ffmpeg/avcodec.h> + +using namespace std; /** * @author Jean-francois Blanchard-dionne */