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
e5cf100d
Commit
e5cf100d
authored
Nov 01, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegvideo_probe: check slice order
Fixes: Enrique.mp3 Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
7fd9d49b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
3 deletions
+13
-3
mpegvideodec.c
libavformat/mpegvideodec.c
+13
-3
No files found.
libavformat/mpegvideodec.c
View file @
e5cf100d
...
...
@@ -34,8 +34,9 @@
static
int
mpegvideo_probe
(
AVProbeData
*
p
)
{
uint32_t
code
=
-
1
;
int
pic
=
0
,
seq
=
0
,
slice
=
0
,
pspack
=
0
,
vpes
=
0
,
apes
=
0
,
res
=
0
;
int
pic
=
0
,
seq
=
0
,
slice
=
0
,
pspack
=
0
,
vpes
=
0
,
apes
=
0
,
res
=
0
,
sicle
=
0
;
int
i
;
uint32_t
last
=
0
;
for
(
i
=
0
;
i
<
p
->
buf_size
;
i
++
){
code
=
(
code
<<
8
)
+
p
->
buf
[
i
];
...
...
@@ -47,12 +48,21 @@ static int mpegvideo_probe(AVProbeData *p)
case
0x1b6
:
res
++
;
break
;
}
if
(
code
>=
SLICE_START_CODE
&&
code
<=
0x1af
)
slice
++
;
if
(
code
>=
SLICE_START_CODE
&&
code
<=
0x1af
)
{
if
(
last
>=
SLICE_START_CODE
&&
last
<=
0x1af
)
{
if
(
code
>=
last
)
slice
++
;
else
sicle
++
;
}
else
{
if
(
code
==
SLICE_START_CODE
)
slice
++
;
else
sicle
++
;
}
}
if
((
code
&
0x1f0
)
==
VIDEO_ID
)
vpes
++
;
else
if
((
code
&
0x1e0
)
==
AUDIO_ID
)
apes
++
;
last
=
code
;
}
}
if
(
seq
&&
seq
*
9
<=
pic
*
10
&&
pic
*
9
<=
slice
*
10
&&
!
pspack
&&
!
apes
&&
!
res
)
{
if
(
seq
&&
seq
*
9
<=
pic
*
10
&&
pic
*
9
<=
slice
*
10
&&
!
pspack
&&
!
apes
&&
!
res
&&
slice
>
sicle
)
{
if
(
vpes
)
return
AVPROBE_SCORE_MAX
/
8
;
else
return
pic
>
1
?
AVPROBE_SCORE_MAX
/
2
+
1
:
AVPROBE_SCORE_MAX
/
4
;
// +1 for .mpg
}
...
...
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