Commit 05c055c3 authored by Jean Tessier's avatar Jean Tessier

Modification erreur de compilation dans video

parent 9e30076b
......@@ -7,7 +7,7 @@
Capture::~Capture(){}
void Capture::nextCaptureMode(){}
bool Capture::nextCaptureMode(){}
bool Capture::forceCaptureMode(int captModePos){
......
/* 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
......
......@@ -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
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment