Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
2577897d
Commit
2577897d
authored
Jun 29, 2005
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix assertion failure
Originally committed as revision 4411 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
73480a15
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
utils.c
libavformat/utils.c
+7
-2
No files found.
libavformat/utils.c
View file @
2577897d
...
@@ -2286,6 +2286,8 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
...
@@ -2286,6 +2286,8 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt)
/**
/**
* interleave_packet implementation which will interleave per DTS.
* interleave_packet implementation which will interleave per DTS.
* packets with pkt->destruct == av_destruct_packet will be freed inside this function.
* so they cannot be used after it, note calling av_free_packet() on them is still safe
*/
*/
static
int
av_interleave_packet_per_dts
(
AVFormatContext
*
s
,
AVPacket
*
out
,
AVPacket
*
pkt
,
int
flush
){
static
int
av_interleave_packet_per_dts
(
AVFormatContext
*
s
,
AVPacket
*
out
,
AVPacket
*
pkt
,
int
flush
){
AVPacketList
*
pktl
,
**
next_point
,
*
this_pktl
;
AVPacketList
*
pktl
,
**
next_point
,
*
this_pktl
;
...
@@ -2295,11 +2297,14 @@ static int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPac
...
@@ -2295,11 +2297,14 @@ static int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPac
if
(
pkt
){
if
(
pkt
){
AVStream
*
st
=
s
->
streams
[
pkt
->
stream_index
];
AVStream
*
st
=
s
->
streams
[
pkt
->
stream_index
];
assert
(
pkt
->
destruct
!=
av_destruct_packet
);
//FIXME
//
assert(pkt->destruct != av_destruct_packet); //FIXME
this_pktl
=
av_mallocz
(
sizeof
(
AVPacketList
));
this_pktl
=
av_mallocz
(
sizeof
(
AVPacketList
));
this_pktl
->
pkt
=
*
pkt
;
this_pktl
->
pkt
=
*
pkt
;
av_dup_packet
(
&
this_pktl
->
pkt
);
if
(
pkt
->
destruct
==
av_destruct_packet
)
pkt
->
destruct
=
NULL
;
// non shared -> must keep original from being freed
else
av_dup_packet
(
&
this_pktl
->
pkt
);
//shared -> must dup
next_point
=
&
s
->
packet_buffer
;
next_point
=
&
s
->
packet_buffer
;
while
(
*
next_point
){
while
(
*
next_point
){
...
...
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