diff options
| author | Michael Niedermayer | 2012-06-08 23:02:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-06-08 23:59:09 +0200 |
| commit | 7e22514d98ecd56cc4e55dac7c813551e2152b80 (patch) | |
| tree | 13c47e1e1215525323177a008d5406a7d61a418a /libavcodec/arm/fmtconvert_neon.S | |
| parent | e016e3c9d7ce1493b952bdd8232f7e03077469a3 (diff) | |
| parent | 3b81a18ba30bf18bab78f56744d8f3e1e4060104 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: ppc: add a separate header for Altivec function prototypes
ARM: fix float_dsp breakage from d5a7229
Add a float DSP framework to libavutil
PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
ARM: Move asm.S from libavcodec to libavutil
vc1dsp: mark put/avg_vc1_mspel_mc() always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/fmtconvert_neon.S')
| -rw-r--r-- | libavcodec/arm/fmtconvert_neon.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/fmtconvert_neon.S b/libavcodec/arm/fmtconvert_neon.S index 17af9f524a..83fc124a29 100644 --- a/libavcodec/arm/fmtconvert_neon.S +++ b/libavcodec/arm/fmtconvert_neon.S @@ -20,7 +20,7 @@ */ #include "config.h" -#include "asm.S" +#include "libavutil/arm/asm.S" preserve8 |