diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-30 01:23:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-30 01:29:11 +0200 |
| commit | 5a35cef4b102ba99c31f83db8092b4d36383b044 (patch) | |
| tree | 13bf45700873c38b3824eb917118d4bda450453d /libavcodec/arm/asm.S | |
| parent | adba9c63525b8971fc6ccda47e643dca05c3ee9d (diff) | |
| parent | 371266daa3df35c424203fff0ce2e6de0e33a29d (diff) | |
| download | ffmpeg-5a35cef4b102ba99c31f83db8092b4d36383b044.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: enable UAL syntax in asm.S
v4l2: don't leak video standard string on error.
swscale: Remove disabled code.
avfilter: Surround function only used in debug mode by appropriate #ifdef.
vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().
build: remove BUILD_ROOT variable
vp8: use av_clip_uintp2() where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/asm.S')
| -rw-r--r-- | libavcodec/arm/asm.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S index cf73a77609..bb999fd61a 100644 --- a/libavcodec/arm/asm.S +++ b/libavcodec/arm/asm.S @@ -26,6 +26,8 @@ # define ELF @ #endif + .syntax unified + .macro require8 val=1 ELF .eabi_attribute 24, \val .endm |