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
a846dccb
Commit
a846dccb
authored
Feb 06, 2013
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264chroma: x86: Fix building with yasm disabled
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
82bd04b1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Makefile
libavcodec/x86/Makefile
+2
-2
h264chroma_init.c
libavcodec/x86/h264chroma_init.c
+2
-0
No files found.
libavcodec/x86/Makefile
View file @
a846dccb
...
@@ -5,6 +5,7 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
...
@@ -5,6 +5,7 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o
OBJS-$(CONFIG_CAVS_DECODER)
+=
x86/cavsdsp.o
OBJS-$(CONFIG_CAVS_DECODER)
+=
x86/cavsdsp.o
OBJS-$(CONFIG_DNXHD_ENCODER)
+=
x86/dnxhdenc.o
OBJS-$(CONFIG_DNXHD_ENCODER)
+=
x86/dnxhdenc.o
OBJS-$(CONFIG_FFT)
+=
x86/fft_init.o
OBJS-$(CONFIG_FFT)
+=
x86/fft_init.o
OBJS-$(CONFIG_H264CHROMA)
+=
x86/h264chroma_init.o
OBJS-$(CONFIG_H264DSP)
+=
x86/h264dsp_init.o
OBJS-$(CONFIG_H264DSP)
+=
x86/h264dsp_init.o
OBJS-$(CONFIG_H264PRED)
+=
x86/h264_intrapred_init.o
OBJS-$(CONFIG_H264PRED)
+=
x86/h264_intrapred_init.o
OBJS-$(CONFIG_H264QPEL)
+=
x86/h264_qpel.o
OBJS-$(CONFIG_H264QPEL)
+=
x86/h264_qpel.o
...
@@ -43,8 +44,7 @@ YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
...
@@ -43,8 +44,7 @@ YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
YASM-OBJS-$(CONFIG_DCT)
+=
x86/dct32.o
YASM-OBJS-$(CONFIG_DCT)
+=
x86/dct32.o
YASM-OBJS-$(CONFIG_ENCODERS)
+=
x86/dsputilenc.o
YASM-OBJS-$(CONFIG_ENCODERS)
+=
x86/dsputilenc.o
YASM-OBJS-$(CONFIG_FFT)
+=
x86/fft.o
YASM-OBJS-$(CONFIG_FFT)
+=
x86/fft.o
YASM-OBJS-$(CONFIG_H264CHROMA)
+=
x86/h264chroma_init.o
\
YASM-OBJS-$(CONFIG_H264CHROMA)
+=
x86/h264_chromamc.o
\
x86/h264_chromamc.o
\
x86/h264_chromamc_10bit.o
x86/h264_chromamc_10bit.o
YASM-OBJS-$(CONFIG_H264DSP)
+=
x86/h264_deblock.o
\
YASM-OBJS-$(CONFIG_H264DSP)
+=
x86/h264_deblock.o
\
x86/h264_deblock_10bit.o
\
x86/h264_deblock_10bit.o
\
...
...
libavcodec/x86/h264chroma_init.c
View file @
a846dccb
...
@@ -68,6 +68,7 @@ CHROMA_MC(avg, 8, 10, avx)
...
@@ -68,6 +68,7 @@ CHROMA_MC(avg, 8, 10, avx)
void
ff_h264chroma_init_x86
(
H264ChromaContext
*
c
,
int
bit_depth
)
void
ff_h264chroma_init_x86
(
H264ChromaContext
*
c
,
int
bit_depth
)
{
{
#if HAVE_YASM
int
high_bit_depth
=
bit_depth
>
8
;
int
high_bit_depth
=
bit_depth
>
8
;
int
mm_flags
=
av_get_cpu_flags
();
int
mm_flags
=
av_get_cpu_flags
();
...
@@ -113,4 +114,5 @@ void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
...
@@ -113,4 +114,5 @@ void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth)
c
->
put_h264_chroma_pixels_tab
[
0
]
=
ff_put_h264_chroma_mc8_10_avx
;
c
->
put_h264_chroma_pixels_tab
[
0
]
=
ff_put_h264_chroma_mc8_10_avx
;
c
->
avg_h264_chroma_pixels_tab
[
0
]
=
ff_avg_h264_chroma_mc8_10_avx
;
c
->
avg_h264_chroma_pixels_tab
[
0
]
=
ff_avg_h264_chroma_mc8_10_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