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
5468c1d0
Commit
5468c1d0
authored
Mar 16, 2019
by
Lynne
Committed by
Carl Eugen Hoyos
Mar 31, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
celt_pvq_init: only build when CONFIG_OPUS_ENCODER is enabled
The entire function was defined away before.
parent
4a2c6516
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
4 deletions
+1
-4
opus_pvq.c
libavcodec/opus_pvq.c
+1
-1
Makefile
libavcodec/x86/Makefile
+0
-1
celt_pvq_init.c
libavcodec/x86/celt_pvq_init.c
+0
-2
No files found.
libavcodec/opus_pvq.c
View file @
5468c1d0
...
...
@@ -903,7 +903,7 @@ int av_cold ff_celt_pvq_init(CeltPVQ **pvq, int encode)
s
->
pvq_search
=
ppp_pvq_search_c
;
s
->
quant_band
=
encode
?
pvq_encode_band
:
pvq_decode_band
;
if
(
ARCH_X86
)
if
(
CONFIG_OPUS_ENCODER
&&
ARCH_X86
)
ff_celt_pvq_init_x86
(
s
);
*
pvq
=
s
;
...
...
libavcodec/x86/Makefile
View file @
5468c1d0
...
...
@@ -53,7 +53,6 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
OBJS-$(CONFIG_DCA_DECODER)
+=
x86/dcadsp_init.o
x86/synth_filter_init.o
OBJS-$(CONFIG_DNXHD_ENCODER)
+=
x86/dnxhdenc_init.o
OBJS-$(CONFIG_EXR_DECODER)
+=
x86/exrdsp_init.o
OBJS-$(CONFIG_OPUS_DECODER)
+=
x86/celt_pvq_init.o
OBJS-$(CONFIG_OPUS_ENCODER)
+=
x86/celt_pvq_init.o
OBJS-$(CONFIG_HEVC_DECODER)
+=
x86/hevcdsp_init.o
OBJS-$(CONFIG_JPEG2000_DECODER)
+=
x86/jpeg2000dsp_init.o
...
...
libavcodec/x86/celt_pvq_init.c
View file @
5468c1d0
...
...
@@ -32,7 +32,6 @@ av_cold void ff_celt_pvq_init_x86(CeltPVQ *s)
{
int
cpu_flags
=
av_get_cpu_flags
();
#if CONFIG_OPUS_ENCODER
if
(
EXTERNAL_SSE2
(
cpu_flags
))
s
->
pvq_search
=
ff_pvq_search_approx_sse2
;
...
...
@@ -41,5 +40,4 @@ av_cold void ff_celt_pvq_init_x86(CeltPVQ *s)
if
(
EXTERNAL_AVX_FAST
(
cpu_flags
))
s
->
pvq_search
=
ff_pvq_search_exact_avx
;
#endif
}
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