Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
05c055c3
Commit
05c055c3
authored
17 years ago
by
Jean Tessier
Browse files
Options
Downloads
Patches
Plain Diff
Modification erreur de compilation dans video
parent
9e30076b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/video/V4L/Capture.cpp
+1
-1
1 addition, 1 deletion
src/video/V4L/Capture.cpp
src/video/V4L/Capture.h
+8
-3
8 additions, 3 deletions
src/video/V4L/Capture.h
src/video/VideoCodecDescriptor.h
+5
-1
5 additions, 1 deletion
src/video/VideoCodecDescriptor.h
with
14 additions
and
5 deletions
src/video/V4L/Capture.cpp
+
1
−
1
View file @
05c055c3
...
...
@@ -7,7 +7,7 @@
Capture
::~
Capture
(){}
void
Capture
::
nextCaptureMode
(){}
bool
Capture
::
nextCaptureMode
(){}
bool
Capture
::
forceCaptureMode
(
int
captModePos
){
...
...
This diff is collapsed.
Click to expand it.
src/video/V4L/Capture.h
+
8
−
3
View file @
05c055c3
/* 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
V
ector
<
CaptureMode
*>
captureModesVector
;
v
ector
<
CaptureMode
*>
captureModesVector
;
};
#endif //CAPTURE_H
...
...
This diff is collapsed.
Click to expand it.
src/video/VideoCodecDescriptor.h
+
5
−
1
View file @
05c055c3
...
...
@@ -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
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment