Browse Source

re-enable mid_pred asm on x86_64. (broke in r16681)

Originally committed as revision 17058 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Loren Merritt 16 years ago
parent
commit
6166516d1f
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      libavcodec/mathops.h
  2. +2
    -0
      libavcodec/x86/mathops.h

+ 1
- 1
libavcodec/mathops.h View File

@@ -24,7 +24,7 @@


#include "libavutil/common.h" #include "libavutil/common.h"


#if ARCH_X86_32
#if ARCH_X86


#include "x86/mathops.h" #include "x86/mathops.h"




+ 2
- 0
libavcodec/x86/mathops.h View File

@@ -25,6 +25,7 @@
#include "config.h" #include "config.h"
#include "libavutil/common.h" #include "libavutil/common.h"


#if ARCH_X86_32
#define MULL(ra, rb, shift) \ #define MULL(ra, rb, shift) \
({ int rt, dummy; __asm__ (\ ({ int rt, dummy; __asm__ (\
"imull %3 \n\t"\ "imull %3 \n\t"\
@@ -42,6 +43,7 @@
({ int64_t rt;\ ({ int64_t rt;\
__asm__ ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\ __asm__ ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\
rt; }) rt; })
#endif


#if HAVE_CMOV #if HAVE_CMOV
/* median of 3 */ /* median of 3 */


Loading…
Cancel
Save