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
34cba655
Commit
34cba655
authored
Oct 25, 2018
by
Zhong Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/qsvenc: remove redundant code
Signed-off-by:
Zhong Li
<
zhong.li@intel.com
>
parent
b44a571d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
qsvenc.c
libavcodec/qsvenc.c
+5
-8
No files found.
libavcodec/qsvenc.c
View file @
34cba655
...
...
@@ -444,6 +444,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
const
AVPixFmtDescriptor
*
desc
;
float
quant
;
int
ret
;
mfxVersion
ver
;
ret
=
ff_qsv_codec_id_to_mfx
(
avctx
->
codec_id
);
if
(
ret
<
0
)
...
...
@@ -611,8 +612,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
q
->
extparam_internal
[
q
->
nb_extparam_internal
++
]
=
(
mfxExtBuffer
*
)
&
q
->
extco
;
#if QSV_HAVE_CO2
if
(
avctx
->
codec_id
==
AV_CODEC_ID_H264
)
{
#if QSV_HAVE_CO2
q
->
extco2
.
Header
.
BufferId
=
MFX_EXTBUFF_CODING_OPTION2
;
q
->
extco2
.
Header
.
BufferSz
=
sizeof
(
q
->
extco2
);
...
...
@@ -641,11 +642,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
q
->
extco2
.
Trellis
=
q
->
trellis
;
#endif
#if QSV_
HAVE_LA_DS
#if QSV_
VERSION_ATLEAST(1, 8)
q
->
extco2
.
LookAheadDS
=
q
->
look_ahead_downsampling
;
#endif
#if QSV_HAVE_BREF_TYPE
#if FF_API_PRIVATE_OPT
FF_DISABLE_DEPRECATION_WARNINGS
if
(
avctx
->
b_frame_strategy
>=
0
)
...
...
@@ -675,11 +674,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
#endif
q
->
extparam_internal
[
q
->
nb_extparam_internal
++
]
=
(
mfxExtBuffer
*
)
&
q
->
extco2
;
}
#endif
#if QSV_HAVE_MF
if
(
avctx
->
codec_id
==
AV_CODEC_ID_H264
)
{
mfxVersion
ver
;
ret
=
MFXQueryVersion
(
q
->
session
,
&
ver
);
if
(
ret
>=
MFX_ERR_NONE
&&
QSV_RUNTIME_VERSION_ATLEAST
(
ver
,
1
,
25
))
{
q
->
extmfp
.
Header
.
BufferId
=
MFX_EXTBUFF_MULTI_FRAME_PARAM
;
...
...
@@ -689,9 +686,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_log
(
avctx
,
AV_LOG_VERBOSE
,
"MFMode:%d
\n
"
,
q
->
extmfp
.
MFMode
);
q
->
extparam_internal
[
q
->
nb_extparam_internal
++
]
=
(
mfxExtBuffer
*
)
&
q
->
extmfp
;
}
}
#endif
}
}
if
(
!
check_enc_param
(
avctx
,
q
))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
...
...
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