[FFmpeg-cvslog] x86: hevcdsp_init: fix macro usage

Christophe Gisquet git at videolan.org
Sun Jun 1 23:33:59 CEST 2014


ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Sun Jun  1 14:12:57 2014 +0000| [09fc28aed1fd3320d20e84f045d1c0c699d67163] | committer: Michael Niedermayer

x86: hevcdsp_init: fix macro usage

The macro was not using the parameter but unconditionally using sse4.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09fc28aed1fd3320d20e84f045d1c0c699d67163
---

 libavcodec/x86/hevcdsp_init.c |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c
index e5ef287..30902be 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)



More information about the ffmpeg-cvslog mailing list