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
66244baf
Commit
66244baf
authored
Nov 24, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: fix mixed declarations and statements.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
d92073ac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
ffmpeg.c
ffmpeg.c
+3
-2
No files found.
ffmpeg.c
View file @
66244baf
...
@@ -2775,6 +2775,7 @@ static int process_input(int file_index)
...
@@ -2775,6 +2775,7 @@ static int process_input(int file_index)
}
}
if
(
!
ist
->
wrap_correction_done
&&
is
->
start_time
!=
AV_NOPTS_VALUE
&&
ist
->
st
->
pts_wrap_bits
<
64
){
if
(
!
ist
->
wrap_correction_done
&&
is
->
start_time
!=
AV_NOPTS_VALUE
&&
ist
->
st
->
pts_wrap_bits
<
64
){
int64_t
stime
,
stime2
;
// Correcting starttime based on the enabled streams
// Correcting starttime based on the enabled streams
// FIXME this ideally should be done before the first use of starttime but we do not know which are the enabled streams at that point.
// FIXME this ideally should be done before the first use of starttime but we do not know which are the enabled streams at that point.
// so we instead do it here as part of discontinuity handling
// so we instead do it here as part of discontinuity handling
...
@@ -2794,8 +2795,8 @@ static int process_input(int file_index)
...
@@ -2794,8 +2795,8 @@ static int process_input(int file_index)
}
}
}
}
int64_t
stime
=
av_rescale_q
(
is
->
start_time
,
AV_TIME_BASE_Q
,
ist
->
st
->
time_base
);
stime
=
av_rescale_q
(
is
->
start_time
,
AV_TIME_BASE_Q
,
ist
->
st
->
time_base
);
int64_t
stime2
=
stime
+
(
1ULL
<<
ist
->
st
->
pts_wrap_bits
);
stime2
=
stime
+
(
1ULL
<<
ist
->
st
->
pts_wrap_bits
);
ist
->
wrap_correction_done
=
1
;
ist
->
wrap_correction_done
=
1
;
if
(
stime2
>
stime
&&
pkt
.
dts
!=
AV_NOPTS_VALUE
&&
pkt
.
dts
>
stime
+
(
1LL
<<
(
ist
->
st
->
pts_wrap_bits
-
1
)))
{
if
(
stime2
>
stime
&&
pkt
.
dts
!=
AV_NOPTS_VALUE
&&
pkt
.
dts
>
stime
+
(
1LL
<<
(
ist
->
st
->
pts_wrap_bits
-
1
)))
{
...
...
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