diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:32:03 +0200 |
| commit | 6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a (patch) | |
| tree | 892dbfcfc54c4acdfe9619fdb597eb741c6abae6 /libavcodec/x86 | |
| parent | 840238b8706ea2ca740cf4b49bffd8ae196352f9 (diff) | |
| parent | a1d0dcc7134f1401c682b5e13d4ab3864da21efb (diff) | |
| download | ffmpeg-6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: make executable again
LATM/AAC: Free previously initialized context on reinit.
configure: Do not unconditionally add -Wall to host CFLAGS.
configure: Set OS/2 objformat to a.out.
Add support for a.out object format to assembler macros.
fate: disable threading for encoding
fate: add comment field
fate: allow overriding default build and install dirs
mpegtsenc: Add an AVClass pointer to the private data
mpegaudio: clean up #includes
mpegaudio: move all header parsing to mpegaudiodecheader.[ch]
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_yasm.asm | 2 | ||||
| -rw-r--r-- | libavcodec/x86/fft_mmx.asm | 2 | ||||
| -rw-r--r-- | libavcodec/x86/fmtconvert.asm | 2 | ||||
| -rw-r--r-- | libavcodec/x86/x86inc.asm | 11 |
4 files changed, 14 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputil_yasm.asm b/libavcodec/x86/dsputil_yasm.asm index a41640b0a2..695aba5ec3 100644 --- a/libavcodec/x86/dsputil_yasm.asm +++ b/libavcodec/x86/dsputil_yasm.asm @@ -30,7 +30,7 @@ pb_zz11zz55zz99zzdd: db -1,-1,1,1,-1,-1,5,5,-1,-1,9,9,-1,-1,13,13 pb_revwords: db 14, 15, 12, 13, 10, 11, 8, 9, 6, 7, 4, 5, 2, 3, 0, 1 pd_16384: times 4 dd 16384 -section .text align=16 +SECTION_TEXT %macro SCALARPRODUCT 1 ; int scalarproduct_int16(int16_t *v1, int16_t *v2, int order, int shift) diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm index 02b638f144..2551b48df2 100644 --- a/libavcodec/x86/fft_mmx.asm +++ b/libavcodec/x86/fft_mmx.asm @@ -85,7 +85,7 @@ cextern cos_ %+ i %1 %endmacro -section .text align=16 +SECTION_TEXT %macro T2_3DN 4 ; z0, z1, mem0, mem1 mova %1, %3 diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index 171e52a165..c4a9a66009 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -22,7 +22,7 @@ %include "x86inc.asm" %include "x86util.asm" -section .text align=16 +SECTION_TEXT %macro PSWAPD_SSE 2 pshufw %1, %2, 0x4e diff --git a/libavcodec/x86/x86inc.asm b/libavcodec/x86/x86inc.asm index 53091c14c9..c84d5566a2 100644 --- a/libavcodec/x86/x86inc.asm +++ b/libavcodec/x86/x86inc.asm @@ -63,11 +63,22 @@ %elifidn __OUTPUT_FORMAT__,macho SECTION .text align=%1 fakegot: + %elifidn __OUTPUT_FORMAT__,aout + section .text %else SECTION .rodata align=%1 %endif %endmacro +; aout does not support align= +%macro SECTION_TEXT 0-1 16 + %ifidn __OUTPUT_FORMAT__,aout + SECTION .text + %else + SECTION .text align=%1 + %endif +%endmacro + %ifdef WIN64 %define PIC %elifndef ARCH_X86_64 |