[SCM] libav/experimental: Fix compilation in x86_64. I broke it with r24580.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:13:00 UTC 2013


The following commit has been merged in the experimental branch:
commit 740dfe7012a41350292f77692867595d8cfa5370
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Thu Jul 29 22:45:21 2010 +0000

    Fix compilation in x86_64. I broke it with r24580.
    
    Originally committed as revision 24582 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/x86/idct_mmx.c b/libavcodec/x86/idct_mmx.c
index eaefc24..57fa818 100644
--- a/libavcodec/x86/idct_mmx.c
+++ b/libavcodec/x86/idct_mmx.c
@@ -194,7 +194,7 @@ static inline void mmxext_row_mid (int16_t * const row, const int store,
 
         "movq       8(%3), %%mm4       \n\t" /* mm4 = C6 C4 C6 C4 */
         "pshufw     $0x4e, %%mm2, %%mm2\n\t" /* mm2 = x2 x0 x6 x4 */
-        :: "r" (row), "r" (2*offset), "r" (2*store), "r" (table)
+        :: "r" (row), "r" ((x86_reg) (2*offset)), "r" ((x86_reg) (2*store)), "r" (table)
         );
 }
 
@@ -337,7 +337,7 @@ static inline void mmx_row_mid (int16_t * const row, const int store,
 
         "movq      %%mm7, 8(%0,%2) \n\t" /* save y7 y6 y5 y4 */
         "pmaddwd   %%mm0, %%mm3    \n\t" /* mm3 = C4*x0+C6*x2 C4*x0+C2*x2 */
-        : : "r" (row), "r"(2*offset), "r" (2*store), "r" (table)
+        : : "r" (row), "r" ((x86_reg) (2*offset)), "r" ((x86_reg) (2*store)), "r" (table)
         );
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list