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
5b852938
Commit
5b852938
authored
Dec 04, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: asf: flush remaining tail data (fix #5356)
parent
3b7a8af4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
0 deletions
+19
-0
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+19
-0
No files found.
modules/demux/asf/asf.c
View file @
5b852938
...
...
@@ -67,6 +67,7 @@ vlc_module_end ()
*****************************************************************************/
static
int
Demux
(
demux_t
*
);
static
int
Control
(
demux_t
*
,
int
i_query
,
va_list
args
);
static
void
FlushRemainingPackets
(
demux_t
*
p_demux
);
#define MAX_ASF_TRACKS 128
...
...
@@ -194,6 +195,7 @@ static int Demux( demux_t *p_demux )
/* Read and demux a packet */
if
(
(
i_result
=
DemuxPacket
(
p_demux
)
)
<=
0
)
{
FlushRemainingPackets
(
p_demux
);
return
i_result
;
}
if
(
i_time_begin
==
-
1
)
...
...
@@ -1346,6 +1348,22 @@ error:
ASF_FreeObjectRoot
(
p_demux
->
s
,
p_sys
->
p_root
);
return
VLC_EGENERIC
;
}
/*****************************************************************************
* FlushRemainingPackets: flushes tail packets
*****************************************************************************/
static
void
FlushRemainingPackets
(
demux_t
*
p_demux
)
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
for
(
unsigned
int
i
=
0
;
i
<
MAX_ASF_TRACKS
;
i
++
)
{
asf_track_t
*
tk
=
p_sys
->
track
[
i
];
if
(
tk
&&
tk
->
p_frame
)
SendPacket
(
p_demux
,
tk
);
}
}
/*****************************************************************************
*
*****************************************************************************/
...
...
@@ -1372,6 +1390,7 @@ static void DemuxEnd( demux_t *p_demux )
{
if
(
tk
->
p_frame
)
{
msg_Warn
(
p_demux
,
"Still one frame for track %u, something is wrong"
,
i
);
block_ChainRelease
(
tk
->
p_frame
);
}
if
(
tk
->
p_es
)
...
...
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