Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
76331361
Commit
76331361
authored
Jan 29, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/sccdec: simplify 2 sscanf calls
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
cba4f0e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
sccdec.c
libavformat/sccdec.c
+2
-4
No files found.
libavformat/sccdec.c
View file @
76331361
...
...
@@ -94,8 +94,7 @@ static int scc_read_header(AVFormatContext *s)
if
(
!
strncmp
(
line
,
"Scenarist_SCC V1.0"
,
18
))
continue
;
if
(
sscanf
(
line
,
"%d:%d:%d:%d"
,
&
hh1
,
&
mm1
,
&
ss1
,
&
fs1
)
!=
4
&&
sscanf
(
line
,
"%d:%d:%d;%d"
,
&
hh1
,
&
mm1
,
&
ss1
,
&
fs1
)
!=
4
)
if
(
sscanf
(
line
,
"%d:%d:%d%*[:;]%d"
,
&
hh1
,
&
mm1
,
&
ss1
,
&
fs1
)
!=
4
)
continue
;
ts_start
=
(
hh1
*
3600LL
+
mm1
*
60LL
+
ss1
)
*
1000LL
+
fs1
*
33
;
...
...
@@ -105,8 +104,7 @@ static int scc_read_header(AVFormatContext *s)
if
(
len2
>
13
)
break
;
}
if
(
sscanf
(
line2
,
"%d:%d:%d:%d"
,
&
hh2
,
&
mm2
,
&
ss2
,
&
fs2
)
!=
4
&&
sscanf
(
line2
,
"%d:%d:%d;%d"
,
&
hh2
,
&
mm2
,
&
ss2
,
&
fs2
)
!=
4
)
if
(
sscanf
(
line2
,
"%d:%d:%d%*[:;]%d"
,
&
hh2
,
&
mm2
,
&
ss2
,
&
fs2
)
!=
4
)
continue
;
ts_end
=
(
hh2
*
3600LL
+
mm2
*
60LL
+
ss2
)
*
1000LL
+
fs2
*
33
;
...
...
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