aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-06-01 14:12:57 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-06-01 23:20:07 +0200
commit09fc28aed1fd3320d20e84f045d1c0c699d67163 (patch)
tree2fc6678fd46b6a930ce2e6b6d5bcaf9d8f98e99c
parent8b686c886c808947b98ce0426fff213b14b836df (diff)
downloadffmpeg-09fc28aed1fd3320d20e84f045d1c0c699d67163.tar.gz
x86: hevcdsp_init: fix macro usage
The macro was not using the parameter but unconditionally using sse4. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/hevcdsp_init.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c
index e5ef28759b..30902be3bf 100644
--- a/libavcodec/x86/hevcdsp_init.c
+++ b/libavcodec/x86/hevcdsp_init.c
@@ -343,24 +343,24 @@ mc_bi_w_funcs(qpel_hv, 10, sse4);
#define EPEL_LINKS(pointer, my, mx, fname, bitd, opt ) \
- PEL_LINK(pointer, 1, my , mx , fname##4 , bitd, sse4 ); \
- PEL_LINK(pointer, 2, my , mx , fname##6 , bitd, sse4 ); \
- PEL_LINK(pointer, 3, my , mx , fname##8 , bitd, sse4 ); \
- PEL_LINK(pointer, 4, my , mx , fname##12, bitd, sse4 ); \
- PEL_LINK(pointer, 5, my , mx , fname##16, bitd, sse4 ); \
- PEL_LINK(pointer, 6, my , mx , fname##24, bitd, sse4 ); \
- PEL_LINK(pointer, 7, my , mx , fname##32, bitd, sse4 ); \
- PEL_LINK(pointer, 8, my , mx , fname##48, bitd, sse4 ); \
- PEL_LINK(pointer, 9, my , mx , fname##64, bitd, sse4 )
-#define QPEL_LINKS(pointer, my, mx, fname, bitd, sse4) \
- PEL_LINK(pointer, 1, my , mx , fname##4 , bitd, sse4 ); \
- PEL_LINK(pointer, 3, my , mx , fname##8 , bitd, sse4 ); \
- PEL_LINK(pointer, 4, my , mx , fname##12, bitd, sse4 ); \
- PEL_LINK(pointer, 5, my , mx , fname##16, bitd, sse4 ); \
- PEL_LINK(pointer, 6, my , mx , fname##24, bitd, sse4 ); \
- PEL_LINK(pointer, 7, my , mx , fname##32, bitd, sse4 ); \
- PEL_LINK(pointer, 8, my , mx , fname##48, bitd, sse4 ); \
- PEL_LINK(pointer, 9, my , mx , fname##64, bitd, sse4 )
+ PEL_LINK(pointer, 1, my , mx , fname##4 , bitd, opt ); \
+ PEL_LINK(pointer, 2, my , mx , fname##6 , bitd, opt ); \
+ PEL_LINK(pointer, 3, my , mx , fname##8 , bitd, opt ); \
+ PEL_LINK(pointer, 4, my , mx , fname##12, bitd, opt ); \
+ PEL_LINK(pointer, 5, my , mx , fname##16, bitd, opt ); \
+ PEL_LINK(pointer, 6, my , mx , fname##24, bitd, opt ); \
+ PEL_LINK(pointer, 7, my , mx , fname##32, bitd, opt ); \
+ PEL_LINK(pointer, 8, my , mx , fname##48, bitd, opt ); \
+ PEL_LINK(pointer, 9, my , mx , fname##64, bitd, opt )
+#define QPEL_LINKS(pointer, my, mx, fname, bitd, opt) \
+ PEL_LINK(pointer, 1, my , mx , fname##4 , bitd, opt ); \
+ PEL_LINK(pointer, 3, my , mx , fname##8 , bitd, opt ); \
+ PEL_LINK(pointer, 4, my , mx , fname##12, bitd, opt ); \
+ PEL_LINK(pointer, 5, my , mx , fname##16, bitd, opt ); \
+ PEL_LINK(pointer, 6, my , mx , fname##24, bitd, opt ); \
+ PEL_LINK(pointer, 7, my , mx , fname##32, bitd, opt ); \
+ PEL_LINK(pointer, 8, my , mx , fname##48, bitd, opt ); \
+ PEL_LINK(pointer, 9, my , mx , fname##64, bitd, opt )
void ff_hevcdsp_init_x86(HEVCDSPContext *c, const int bit_depth)