projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
463ea05
)
x86: Fix linking of ProRes DSP ASM with YASM disabled.
author
Diego Biurrun
<diego@biurrun.de>
Thu, 20 Oct 2011 13:59:22 +0000
(15:59 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Thu, 20 Oct 2011 14:19:13 +0000
(16:19 +0200)
libavcodec/x86/proresdsp-init.c
patch
|
blob
|
history
diff --git
a/libavcodec/x86/proresdsp-init.c
b/libavcodec/x86/proresdsp-init.c
index
46ba43b
..
f202f9f
100644
(file)
--- a/
libavcodec/x86/proresdsp-init.c
+++ b/
libavcodec/x86/proresdsp-init.c
@@
-31,7
+31,7
@@
void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize,
void ff_proresdsp_x86_init(ProresDSPContext *dsp)
{
-#if ARCH_X86_64
+#if ARCH_X86_64
&& HAVE_YASM
int flags = av_get_cpu_flags();
if (flags & AV_CPU_FLAG_SSE2) {
@@
-49,6
+49,6
@@
void ff_proresdsp_x86_init(ProresDSPContext *dsp)
dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
dsp->idct_put = ff_prores_idct_put_10_avx;
}
-#endif
-#endif
+#endif
/* HAVE_AVX */
+#endif
/* ARCH_X86_64 && HAVE_YASM */
}