Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
bda8acb3
Commit
bda8acb3
authored
Mar 15, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: cleanup headers order
parent
77cd4230
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
10 deletions
+19
-10
modules/access/v4l2/access.c
modules/access/v4l2/access.c
+3
-2
modules/access/v4l2/controls.c
modules/access/v4l2/controls.c
+4
-1
modules/access/v4l2/demux.c
modules/access/v4l2/demux.c
+3
-1
modules/access/v4l2/lib.c
modules/access/v4l2/lib.c
+3
-0
modules/access/v4l2/v4l2.h
modules/access/v4l2/v4l2.h
+0
-2
modules/access/v4l2/video.c
modules/access/v4l2/video.c
+6
-4
No files found.
modules/access/v4l2/access.c
View file @
bda8acb3
...
...
@@ -27,15 +27,16 @@
# include "config.h"
#endif
#include "v4l2.h"
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
#include <vlc_common.h>
#include <vlc_access.h>
#include <vlc_fs.h>
#include "v4l2.h"
static
block_t
*
AccessRead
(
access_t
*
);
static
ssize_t
AccessReadStream
(
access_t
*
,
uint8_t
*
,
size_t
);
static
int
AccessControl
(
access_t
*
,
int
,
va_list
);
...
...
modules/access/v4l2/controls.c
View file @
bda8acb3
...
...
@@ -27,11 +27,14 @@
# include "config.h"
#endif
#include "v4l2.h"
#include <ctype.h>
#include <assert.h>
#include <sys/ioctl.h>
#include <vlc_common.h>
#include "v4l2.h"
typedef
struct
vlc_v4l2_ctrl_name
{
const
char
name
[
28
];
...
...
modules/access/v4l2/demux.c
View file @
bda8acb3
...
...
@@ -27,16 +27,18 @@
# include "config.h"
#endif
#include "v4l2.h"
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <poll.h>
#include <vlc_common.h>
#include <vlc_demux.h>
#include <vlc_fs.h>
#include "v4l2.h"
static
int
DemuxControl
(
demux_t
*
,
int
,
va_list
);
static
int
Demux
(
demux_t
*
);
...
...
modules/access/v4l2/lib.c
View file @
bda8acb3
...
...
@@ -27,6 +27,9 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <vlc_common.h>
#include "v4l2.h"
static
void
*
v4l2_handle
=
NULL
;
...
...
modules/access/v4l2/v4l2.h
View file @
bda8acb3
...
...
@@ -18,8 +18,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc_common.h>
#if defined(HAVE_LINUX_VIDEODEV2_H)
# include <linux/videodev2.h>
#elif defined(HAVE_SYS_VIDEOIO_H)
...
...
modules/access/v4l2/video.c
View file @
bda8acb3
...
...
@@ -37,10 +37,6 @@
# include "config.h"
#endif
#include "v4l2.h"
#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <math.h>
#include <assert.h>
#include <errno.h>
...
...
@@ -48,6 +44,12 @@
#include <sys/mman.h>
#include <poll.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
#include "v4l2.h"
/*****************************************************************************
* Module descriptior
*****************************************************************************/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment