History

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

Michael Niedermayer committed 14 years ago

Commit e986a5d2 parents 36397ea 68d601221 files · +263 −169Browse files

Showing the changes to libavcodec/arm (2 of 21 files). Show all

Unified · Split

2 files
  1. libavcodec/arm/asm.S +1 −0
  2. libavcodec/arm/simple_idct_arm.S +1 −1
libavcodec/arm/asm.S+1−0
@@ -68,6 +68,7 @@ ELF .size \name, . - \name · 67 unmodified lines
68 .purgem endfunc68 .purgem endfunc
69 .endm69 .endm
70 .text70 .text
71 .align 2
71 .if \export72 .if \export
72 .global EXTERN_ASM\name73 .global EXTERN_ASM\name
73EXTERN_ASM\name:74EXTERN_ASM\name:
libavcodec/arm/simple_idct_arm.S+1−1
@@ -491,8 +491,8 @@ __end_bef_a_evaluation: · 490 unmodified lines
491 bal __end_a_evaluation491 bal __end_a_evaluation
492 492
493 493
494__constant_ptr__: @@ see #defines at the beginning of the source code for values.
495 .align494 .align
495__constant_ptr__: @@ see #defines at the beginning of the source code for values.
496 .word W1496 .word W1
497 .word W2497 .word W2
498 .word W3498 .word W3

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t