Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Jean-Baptiste Kempf
vlc
Commits
ddc1908e
Commit
ddc1908e
authored
May 03, 2018
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpeg: check ES just once
parent
92519fab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
modules/demux/mjpeg.c
modules/demux/mjpeg.c
+3
-5
No files found.
modules/demux/mjpeg.c
View file @
ddc1908e
...
...
@@ -278,12 +278,8 @@ static int SendBlock( demux_t *p_demux, int i )
}
p_block
->
i_dts
=
p_block
->
i_pts
;
/* set PCR */
es_out_SetPCR
(
p_demux
->
out
,
p_block
->
i_pts
);
if
(
p_sys
->
p_es
)
es_out_Send
(
p_demux
->
out
,
p_sys
->
p_es
,
p_block
);
else
block_Release
(
p_block
);
es_out_Send
(
p_demux
->
out
,
p_sys
->
p_es
,
p_block
);
if
(
p_sys
->
b_still
)
p_sys
->
i_still_end
=
mdate
()
+
p_sys
->
i_frame_length
;
...
...
@@ -387,6 +383,8 @@ static int Open( vlc_object_t * p_this )
es_format_Init
(
&
p_sys
->
fmt
,
VIDEO_ES
,
VLC_CODEC_MJPG
);
p_sys
->
p_es
=
es_out_Add
(
p_demux
->
out
,
&
p_sys
->
fmt
);
if
(
unlikely
(
p_sys
->
p_es
==
NULL
)
)
return
VLC_ENOMEM
;
p_demux
->
pf_control
=
Control
;
return
VLC_SUCCESS
;
...
...
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