diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 02:22:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 02:22:09 +0100 |
| commit | e986a5d10d95b62cd85aaefc7d4da34699fbedeb (patch) | |
| tree | 38dddca2b4582111bcf1bcb6be2d1c6193300f2d /libavcodec/arm/simple_idct_arm.S | |
| parent | 36397ea1c7e27ab850149cc61394c2baa26dd532 (diff) | |
| parent | 68d6012c723bb520daac5336dcb046c0a5dd3826 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for targa
ARM: fix Thumb-mode simple_idct_arm
ARM: 4-byte align start of all asm functions
rgb2rgb: rgb12to15()
swscale-test: fix stack overread.
swscale: fix invalid conversions and memory problems.
cabac: split cabac.h into declarations and function definitions
cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
cabac: Remove ff_h264_lps_state array.
Conflicts:
libswscale/rgb2rgb.h
libswscale/swscale_unscaled.c
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/simple_idct_arm.S')
| -rw-r--r-- | libavcodec/arm/simple_idct_arm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/simple_idct_arm.S b/libavcodec/arm/simple_idct_arm.S index 4d6d3fb5ad..1d3e9175cc 100644 --- a/libavcodec/arm/simple_idct_arm.S +++ b/libavcodec/arm/simple_idct_arm.S @@ -491,8 +491,8 @@ __end_bef_a_evaluation: bal __end_a_evaluation -__constant_ptr__: @@ see #defines at the beginning of the source code for values. .align +__constant_ptr__: @@ see #defines at the beginning of the source code for values. .word W1 .word W2 .word W3 |