Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
7acb9033
Commit
7acb9033
authored
Mar 27, 2017
by
Mark Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vaapi: Add external control of allow-profile-mismatch
Uses the just-added ALLOW_PROFILE_MISMATCH flag.
parent
64a5260c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
vaapi_decode.c
libavcodec/vaapi_decode.c
+2
-9
No files found.
libavcodec/vaapi_decode.c
View file @
7acb9033
...
...
@@ -283,14 +283,6 @@ static int vaapi_decode_make_config(AVCodecContext *avctx)
int
profile_count
,
exact_match
,
alt_profile
;
const
AVPixFmtDescriptor
*
sw_desc
,
*
desc
;
// Allowing a profile mismatch can be useful because streams may
// over-declare their required capabilities - in particular, many
// H.264 baseline profile streams (notably some of those in FATE)
// only use the feature set of constrained baseline. This flag
// would have to be be set by some external means in order to
// actually be useful. (AV_HWACCEL_FLAG_IGNORE_PROFILE?)
int
allow_profile_mismatch
=
0
;
codec_desc
=
avcodec_descriptor_get
(
avctx
->
codec_id
);
if
(
!
codec_desc
)
{
err
=
AVERROR
(
EINVAL
);
...
...
@@ -346,7 +338,8 @@ static int vaapi_decode_make_config(AVCodecContext *avctx)
goto
fail
;
}
if
(
!
exact_match
)
{
if
(
allow_profile_mismatch
)
{
if
(
avctx
->
hwaccel_flags
&
AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH
)
{
av_log
(
avctx
,
AV_LOG_VERBOSE
,
"Codec %s profile %d not "
"supported for hardware decode.
\n
"
,
codec_desc
->
name
,
avctx
->
profile
);
...
...
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