Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
233f52fd
Commit
233f52fd
authored
6 years ago
by
Carl Eugen Hoyos
Browse files
Options
Downloads
Patches
Plain Diff
lavf/amr: Stricter heuristic for auto-detection.
Fixes ticket #7125.
parent
92fe0bf1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavformat/amr.c
+6
-4
6 additions, 4 deletions
libavformat/amr.c
libavformat/version.h
+1
-1
1 addition, 1 deletion
libavformat/version.h
with
7 additions
and
5 deletions
libavformat/amr.c
+
6
−
4
View file @
233f52fd
...
...
@@ -178,7 +178,7 @@ AVInputFormat ff_amr_demuxer = {
#if CONFIG_AMRNB_DEMUXER
static
int
amrnb_probe
(
AVProbeData
*
p
)
{
int
mode
,
i
=
0
,
valid
=
0
;
int
mode
,
i
=
0
,
valid
=
0
,
invalid
=
0
;
const
uint8_t
*
b
=
p
->
buf
;
while
(
i
<
p
->
buf_size
)
{
...
...
@@ -197,10 +197,11 @@ static int amrnb_probe(AVProbeData *p)
}
}
else
{
valid
=
0
;
invalid
++
;
i
++
;
}
}
if
(
valid
>
100
)
if
(
valid
>
100
&&
valid
>
invalid
)
return
AVPROBE_SCORE_EXTENSION
/
2
+
1
;
return
0
;
}
...
...
@@ -234,7 +235,7 @@ AVInputFormat ff_amrnb_demuxer = {
#if CONFIG_AMRWB_DEMUXER
static
int
amrwb_probe
(
AVProbeData
*
p
)
{
int
mode
,
i
=
0
,
valid
=
0
;
int
mode
,
i
=
0
,
valid
=
0
,
invalid
=
0
;
const
uint8_t
*
b
=
p
->
buf
;
while
(
i
<
p
->
buf_size
)
{
...
...
@@ -253,10 +254,11 @@ static int amrwb_probe(AVProbeData *p)
}
}
else
{
valid
=
0
;
invalid
++
;
i
++
;
}
}
if
(
valid
>
100
)
if
(
valid
>
100
&&
valid
>
invalid
)
return
AVPROBE_SCORE_EXTENSION
/
2
-
1
;
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
libavformat/version.h
+
1
−
1
View file @
233f52fd
...
...
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 11
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment