Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
50478495
Commit
50478495
authored
Jan 03, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/utils: fix order of buffers in timestamp update code
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
950fb8ac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
utils.c
libavformat/utils.c
+5
-5
No files found.
libavformat/utils.c
View file @
50478495
...
...
@@ -938,8 +938,8 @@ static AVPacketList *get_next_pkt(AVFormatContext *s, AVStream *st, AVPacketList
{
if
(
pktl
->
next
)
return
pktl
->
next
;
if
(
pktl
==
s
->
pa
rse_queue
_end
)
return
s
->
pa
cket_buffer
;
if
(
pktl
==
s
->
pa
cket_buffer
_end
)
return
s
->
pa
rse_queue
;
return
NULL
;
}
...
...
@@ -947,7 +947,7 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index,
int64_t
dts
,
int64_t
pts
,
AVPacket
*
pkt
)
{
AVStream
*
st
=
s
->
streams
[
stream_index
];
AVPacketList
*
pktl
=
s
->
pa
rse_queue
?
s
->
parse_queue
:
s
->
packet_buffer
;
AVPacketList
*
pktl
=
s
->
pa
cket_buffer
?
s
->
packet_buffer
:
s
->
parse_queue
;
int64_t
pts_buffer
[
MAX_REORDER_DELAY
+
1
];
int64_t
shift
;
int
i
,
delay
;
...
...
@@ -994,7 +994,7 @@ static void update_initial_timestamps(AVFormatContext *s, int stream_index,
static
void
update_initial_durations
(
AVFormatContext
*
s
,
AVStream
*
st
,
int
stream_index
,
int
duration
)
{
AVPacketList
*
pktl
=
s
->
pa
rse_queue
?
s
->
parse_queue
:
s
->
packet_buffer
;
AVPacketList
*
pktl
=
s
->
pa
cket_buffer
?
s
->
packet_buffer
:
s
->
parse_queue
;
int64_t
cur_dts
=
RELATIVE_TS_BASE
;
if
(
st
->
first_dts
!=
AV_NOPTS_VALUE
){
...
...
@@ -1018,7 +1018,7 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st,
av_log
(
s
,
AV_LOG_DEBUG
,
"first_dts %s but no packet with dts in the queue
\n
"
,
av_ts2str
(
st
->
first_dts
));
return
;
}
pktl
=
s
->
pa
rse_queue
?
s
->
parse_queue
:
s
->
packet_buffer
;
pktl
=
s
->
pa
cket_buffer
?
s
->
packet_buffer
:
s
->
parse_queue
;
st
->
first_dts
=
cur_dts
;
}
else
if
(
st
->
cur_dts
!=
RELATIVE_TS_BASE
)
return
;
...
...
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