Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
c6957ea9
Commit
c6957ea9
authored
Mar 02, 2007
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Really fixed 'gather' segfault.
parent
44d2954e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
7 deletions
+5
-7
modules/stream_out/gather.c
modules/stream_out/gather.c
+5
-7
No files found.
modules/stream_out/gather.c
View file @
c6957ea9
...
@@ -81,13 +81,12 @@ static int Open( vlc_object_t *p_this )
...
@@ -81,13 +81,12 @@ static int Open( vlc_object_t *p_this )
free
(
p_sys
);
free
(
p_sys
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_sys
->
i_id
=
0
;
p_sys
->
id
=
NULL
;
p_stream
->
pf_add
=
Add
;
p_stream
->
pf_add
=
Add
;
p_stream
->
pf_del
=
Del
;
p_stream
->
pf_del
=
Del
;
p_stream
->
pf_send
=
Send
;
p_stream
->
pf_send
=
Send
;
TAB_INIT
(
p_sys
->
i_id
,
p_sys
->
id
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
}
}
...
@@ -104,12 +103,11 @@ static void Close( vlc_object_t * p_this )
...
@@ -104,12 +103,11 @@ static void Close( vlc_object_t * p_this )
{
{
sout_stream_id_t
*
id
=
p_sys
->
id
[
i
];
sout_stream_id_t
*
id
=
p_sys
->
id
[
i
];
sout_StreamIdDel
(
p_sys
->
p_out
,
id
);
sout_StreamIdDel
(
p_sys
->
p_out
,
id
->
id
);
es_format_Clean
(
&
id
->
fmt
);
es_format_Clean
(
&
id
->
fmt
);
free
(
id
);
free
(
id
);
}
}
if
(
p_sys
->
id
)
TAB_CLEAN
(
p_sys
->
i_id
,
p_sys
->
id
);
free
(
p_sys
->
id
);
sout_StreamDelete
(
p_sys
->
p_out
);
sout_StreamDelete
(
p_sys
->
p_out
);
free
(
p_sys
);
free
(
p_sys
);
...
@@ -163,7 +161,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
...
@@ -163,7 +161,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
if
(
!
id
->
b_used
&&
id
->
fmt
.
i_cat
==
p_fmt
->
i_cat
)
if
(
!
id
->
b_used
&&
id
->
fmt
.
i_cat
==
p_fmt
->
i_cat
)
{
{
TAB_REMOVE
(
p_sys
->
i_id
,
p_sys
->
id
,
id
);
TAB_REMOVE
(
p_sys
->
i_id
,
p_sys
->
id
,
id
);
sout_StreamIdDel
(
p_sys
->
p_out
,
id
);
sout_StreamIdDel
(
p_sys
->
p_out
,
id
->
id
);
es_format_Clean
(
&
id
->
fmt
);
es_format_Clean
(
&
id
->
fmt
);
free
(
id
);
free
(
id
);
...
...
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