Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
c4e60a07
Commit
c4e60a07
authored
Feb 20, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed useless call to picture_Setup() in dc1394 access.
parent
a412c980
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
16 deletions
+2
-16
modules/access/dc1394.c
modules/access/dc1394.c
+2
-16
No files found.
modules/access/dc1394.c
View file @
c4e60a07
...
@@ -80,7 +80,6 @@ struct demux_sys_t
...
@@ -80,7 +80,6 @@ struct demux_sys_t
dc1394camera_t
*
camera
;
dc1394camera_t
*
camera
;
int
selected_camera
;
int
selected_camera
;
uint64_t
selected_uid
;
uint64_t
selected_uid
;
picture_t
pic
;
uint32_t
dma_buffers
;
uint32_t
dma_buffers
;
dc1394featureset_t
features
;
dc1394featureset_t
features
;
quadlet_t
supported_framerates
;
quadlet_t
supported_framerates
;
...
@@ -194,8 +193,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -194,8 +193,6 @@ static int Open( vlc_object_t *p_this )
demux_sys_t
*
p_sys
;
demux_sys_t
*
p_sys
;
es_format_t
fmt
;
es_format_t
fmt
;
dc1394error_t
res
;
dc1394error_t
res
;
int
i_width
;
int
i_height
;
if
(
strncmp
(
p_demux
->
psz_access
,
"dc1394"
,
6
)
!=
0
)
if
(
strncmp
(
p_demux
->
psz_access
,
"dc1394"
,
6
)
!=
0
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -378,21 +375,10 @@ static int Open( vlc_object_t *p_this )
...
@@ -378,21 +375,10 @@ static int Open( vlc_object_t *p_this )
/* TODO - UYV444 chroma converter is missing, when it will be available
/* TODO - UYV444 chroma converter is missing, when it will be available
* fourcc will become variable (and not just a fixed value for UYVY)
* fourcc will become variable (and not just a fixed value for UYVY)
*/
*/
i_width
=
p_sys
->
width
;
i_height
=
p_sys
->
height
;
if
(
picture_Setup
(
&
p_sys
->
pic
,
VLC_CODEC_UYVY
,
i_width
,
i_height
,
1
,
1
)
)
{
msg_Err
(
p_demux
,
"unknown chroma"
);
Close
(
p_this
);
return
VLC_EGENERIC
;
}
es_format_Init
(
&
fmt
,
VIDEO_ES
,
VLC_CODEC_UYVY
);
es_format_Init
(
&
fmt
,
VIDEO_ES
,
VLC_CODEC_UYVY
);
fmt
.
video
.
i_width
=
i_
width
;
fmt
.
video
.
i_width
=
p_sys
->
width
;
fmt
.
video
.
i_height
=
i_
height
;
fmt
.
video
.
i_height
=
p_sys
->
height
;
msg_Dbg
(
p_demux
,
"Added new video es %4.4s %dx%d"
,
msg_Dbg
(
p_demux
,
"Added new video es %4.4s %dx%d"
,
(
char
*
)
&
fmt
.
i_codec
,
fmt
.
video
.
i_width
,
fmt
.
video
.
i_height
);
(
char
*
)
&
fmt
.
i_codec
,
fmt
.
video
.
i_width
,
fmt
.
video
.
i_height
);
...
...
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