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
4fb56a1c
Commit
4fb56a1c
authored
Oct 14, 2008
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use var_createGet instead of var_create (and remove uneeded goto)
parent
7205ca2b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
modules/access/v4l2/v4l2.c
modules/access/v4l2/v4l2.c
+3
-7
No files found.
modules/access/v4l2/v4l2.c
View file @
4fb56a1c
...
...
@@ -765,7 +765,7 @@ static void GetV4L2Params( demux_sys_t *p_sys, vlc_object_t *p_obj )
p_sys
->
i_width
=
var_CreateGetInteger
(
p_obj
,
"v4l2-width"
);
p_sys
->
i_height
=
var_CreateGetInteger
(
p_obj
,
"v4l2-height"
);
var_Create
GetBool
(
p_obj
,
"v4l2-controls-reset"
);
var_Create
(
p_obj
,
"v4l2-controls-reset"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
p_sys
->
f_fps
=
var_CreateGetFloat
(
p_obj
,
"v4l2-fps"
);
p_sys
->
i_sample_rate
=
var_CreateGetInteger
(
p_obj
,
"v4l2-samplerate"
);
...
...
@@ -1680,18 +1680,14 @@ static int InitRead( demux_t *p_demux, int i_fd, unsigned int i_buffer_size )
p_sys
->
p_buffers
=
calloc
(
1
,
sizeof
(
*
p_sys
->
p_buffers
)
);
if
(
!
p_sys
->
p_buffers
)
goto
open_failed
;
return
VLC_EGENERIC
;
p_sys
->
p_buffers
[
0
].
length
=
i_buffer_size
;
p_sys
->
p_buffers
[
0
].
start
=
malloc
(
i_buffer_size
);
if
(
!
p_sys
->
p_buffers
[
0
].
start
)
goto
open_failed
;
return
VLC_ENOMEM
;
return
VLC_SUCCESS
;
open_failed:
return
VLC_EGENERIC
;
}
/*****************************************************************************
...
...
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