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
966304b4
Commit
966304b4
authored
May 09, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avi: do not use vlc_object_kill()
parent
c62a7ad8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+3
-4
No files found.
modules/demux/avi/avi.c
View file @
966304b4
...
...
@@ -244,7 +244,7 @@ static int Open( vlc_object_t * p_this )
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
demux_sys_t
*
p_sys
;
bool
b_index
=
false
;
bool
b_index
=
false
,
b_aborted
=
false
;
int
i_do_index
;
avi_chunk_list_t
*
p_riff
;
...
...
@@ -689,8 +689,7 @@ aviindex:
msg_Dbg
(
p_demux
,
"Fixing AVI index"
);
goto
aviindex
;
case
3
:
/* Kill input */
vlc_object_kill
(
p_demux
->
p_parent
);
b_aborted
=
true
;
goto
error
;
}
}
...
...
@@ -766,7 +765,7 @@ error:
AVI_ChunkFreeRoot
(
p_demux
->
s
,
&
p_sys
->
ck_root
);
free
(
p_sys
);
return
vlc_object_alive
(
p_demux
)
?
VLC_EGENERIC
:
VLC_ETIMEOUT
;
return
b_aborted
?
VLC_ETIMEOUT
:
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