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
835c81d0
Commit
835c81d0
authored
9 years ago
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: missing es cleanup
parent
29ed29e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+6
-3
No files found.
modules/demux/mp4/mp4.c
View file @
835c81d0
...
@@ -117,7 +117,7 @@ struct demux_sys_t
...
@@ -117,7 +117,7 @@ struct demux_sys_t
*****************************************************************************/
*****************************************************************************/
static
void
MP4_TrackCreate
(
demux_t
*
,
mp4_track_t
*
,
MP4_Box_t
*
,
bool
b_force_enable
);
static
void
MP4_TrackCreate
(
demux_t
*
,
mp4_track_t
*
,
MP4_Box_t
*
,
bool
b_force_enable
);
static
int
MP4_frg_TrackCreate
(
demux_t
*
,
mp4_track_t
*
,
MP4_Box_t
*
);
static
int
MP4_frg_TrackCreate
(
demux_t
*
,
mp4_track_t
*
,
MP4_Box_t
*
);
static
void
MP4_TrackDestroy
(
mp4_track_t
*
);
static
void
MP4_TrackDestroy
(
demux_t
*
,
mp4_track_t
*
);
static
block_t
*
MP4_Block_Read
(
demux_t
*
,
const
mp4_track_t
*
,
int
);
static
block_t
*
MP4_Block_Read
(
demux_t
*
,
const
mp4_track_t
*
,
int
);
static
void
MP4_Block_Send
(
demux_t
*
,
mp4_track_t
*
,
block_t
*
);
static
void
MP4_Block_Send
(
demux_t
*
,
mp4_track_t
*
,
block_t
*
);
...
@@ -1714,7 +1714,7 @@ static void Close ( vlc_object_t * p_this )
...
@@ -1714,7 +1714,7 @@ static void Close ( vlc_object_t * p_this )
MP4_BoxFree
(
p_demux
->
s
,
p_sys
->
p_root
);
MP4_BoxFree
(
p_demux
->
s
,
p_sys
->
p_root
);
for
(
i_track
=
0
;
i_track
<
p_sys
->
i_tracks
;
i_track
++
)
for
(
i_track
=
0
;
i_track
<
p_sys
->
i_tracks
;
i_track
++
)
{
{
MP4_TrackDestroy
(
&
p_sys
->
track
[
i_track
]
);
MP4_TrackDestroy
(
p_demux
,
&
p_sys
->
track
[
i_track
]
);
}
}
FREENULL
(
p_sys
->
track
);
FREENULL
(
p_sys
->
track
);
...
@@ -2902,7 +2902,7 @@ static void FreeAndResetChunk( mp4_chunk_t *ck )
...
@@ -2902,7 +2902,7 @@ static void FreeAndResetChunk( mp4_chunk_t *ck )
****************************************************************************
****************************************************************************
* Destroy a track created by MP4_TrackCreate.
* Destroy a track created by MP4_TrackCreate.
****************************************************************************/
****************************************************************************/
static
void
MP4_TrackDestroy
(
mp4_track_t
*
p_track
)
static
void
MP4_TrackDestroy
(
demux_t
*
p_demux
,
mp4_track_t
*
p_track
)
{
{
unsigned
int
i_chunk
;
unsigned
int
i_chunk
;
...
@@ -2912,6 +2912,9 @@ static void MP4_TrackDestroy( mp4_track_t *p_track )
...
@@ -2912,6 +2912,9 @@ static void MP4_TrackDestroy( mp4_track_t *p_track )
es_format_Clean
(
&
p_track
->
fmt
);
es_format_Clean
(
&
p_track
->
fmt
);
if
(
p_track
->
p_es
)
es_out_Del
(
p_demux
->
out
,
p_track
->
p_es
);
for
(
i_chunk
=
0
;
i_chunk
<
p_track
->
i_chunk_count
;
i_chunk
++
)
for
(
i_chunk
=
0
;
i_chunk
<
p_track
->
i_chunk_count
;
i_chunk
++
)
{
{
if
(
p_track
->
chunk
)
if
(
p_track
->
chunk
)
...
...
This diff is collapsed.
Click to expand it.
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