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
6d6faa2a
Commit
6d6faa2a
authored
Jan 23, 2017
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/svq3: Fail for media key encryption.
Tested-by: ami_stuff Fixes a part of ticket #6094.
parent
9e6a2427
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
svq3.c
libavcodec/svq3.c
+5
-3
No files found.
libavcodec/svq3.c
View file @
6d6faa2a
...
@@ -1070,14 +1070,16 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
...
@@ -1070,14 +1070,16 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"illegal slice type %u
\n
"
,
slice_id
);
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"illegal slice type %u
\n
"
,
slice_id
);
return
-
1
;
return
-
1
;
}
}
if
(
get_bits1
(
&
s
->
gb_slice
))
{
avpriv_report_missing_feature
(
s
->
avctx
,
"Media key encryption"
);
return
AVERROR_PATCHWELCOME
;
}
s
->
slice_type
=
ff_h264_golomb_to_pict_type
[
slice_id
];
s
->
slice_type
=
ff_h264_golomb_to_pict_type
[
slice_id
];
if
((
header
&
0x9F
)
==
2
)
{
if
((
header
&
0x9F
)
==
2
)
{
i
=
(
s
->
mb_num
<
64
)
?
6
:
(
1
+
av_log2
(
s
->
mb_num
-
1
)
);
i
=
(
s
->
mb_num
<
64
)
?
5
:
av_log2
(
s
->
mb_num
-
1
);
get_bits
(
&
s
->
gb_slice
,
i
);
get_bits
(
&
s
->
gb_slice
,
i
);
}
else
{
skip_bits1
(
&
s
->
gb_slice
);
}
}
s
->
slice_num
=
get_bits
(
&
s
->
gb_slice
,
8
);
s
->
slice_num
=
get_bits
(
&
s
->
gb_slice
,
8
);
...
...
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