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
f2dda725
Commit
f2dda725
authored
May 18, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unused b_error field (transcode).
parent
e71a9375
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
modules/stream_out/transcode/transcode.h
modules/stream_out/transcode/transcode.h
+0
-1
modules/stream_out/transcode/video.c
modules/stream_out/transcode/video.c
+4
-4
No files found.
modules/stream_out/transcode/transcode.h
View file @
f2dda725
...
...
@@ -25,7 +25,6 @@ struct sout_stream_sys_t
vlc_cond_t
cond
;
picture_t
*
pp_pics
[
PICTURE_RING_SIZE
];
int
i_first_pic
,
i_last_pic
;
bool
b_error
;
/* Audio */
vlc_fourcc_t
i_acodec
;
/* codec audio (0 if not transcode) */
...
...
modules/stream_out/transcode/video.c
View file @
f2dda725
...
...
@@ -132,7 +132,7 @@ static void* EncoderThread( vlc_object_t* p_this )
picture_t
*
p_pic
;
int
canc
=
vlc_savecancel
();
while
(
vlc_object_alive
(
p_sys
)
&&
!
p_sys
->
b_error
)
while
(
vlc_object_alive
(
p_sys
)
)
{
block_t
*
p_block
;
...
...
@@ -140,9 +140,9 @@ static void* EncoderThread( vlc_object_t* p_this )
while
(
p_sys
->
i_last_pic
==
p_sys
->
i_first_pic
)
{
vlc_cond_wait
(
&
p_sys
->
cond
,
&
p_sys
->
lock_out
);
if
(
!
vlc_object_alive
(
p_sys
)
||
p_sys
->
b_error
)
break
;
if
(
!
vlc_object_alive
(
p_sys
)
)
break
;
}
if
(
!
vlc_object_alive
(
p_sys
)
||
p_sys
->
b_error
)
if
(
!
vlc_object_alive
(
p_sys
)
)
{
vlc_mutex_unlock
(
&
p_sys
->
lock_out
);
break
;
...
...
@@ -274,7 +274,7 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
p_sys
->
i_first_pic
=
0
;
p_sys
->
i_last_pic
=
0
;
p_sys
->
p_buffers
=
NULL
;
p_sys
->
b_die
=
p_sys
->
b_error
=
0
;
p_sys
->
b_die
=
0
;
if
(
vlc_thread_create
(
p_sys
,
EncoderThread
,
i_priority
)
)
{
msg_Err
(
p_stream
,
"cannot spawn encoder thread"
);
...
...
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