History

Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

* commit '5bcbb516f2ff45290ef7995b081762e668693672': arm: Add X() around all references to extern symbols

Michael Niedermayer committed 12 years ago

Commit bf90abe2 parents 6427803 5bcbb518 files · +24 −24Browse files

Unified · Split

8 files
  1. libavcodec/arm/fmtconvert_neon.S +1 −1
  2. libavcodec/arm/h264idct_neon.S +8 −8
  3. libavcodec/arm/hpeldsp_armv6.S +2 −2
  4. libavcodec/arm/mdct_neon.S +1 −1
  5. libavcodec/arm/mpegvideo_neon.S +1 −1
  6. libavcodec/arm/videodsp_armv5te.S +1 −1
  7. libavcodec/arm/vp8dsp_armv6.S +8 −8
  8. libavresample/arm/audio_convert_neon.S +2 −2
libavcodec/arm/fmtconvert_neon.S+1−1
@@ -70,7 +70,7 @@ function ff_float_to_int16_interleave_neon, export=1 · 69 unmodified lines
70 cmp r3, #270 cmp r3, #2
71 itt lt71 itt lt
72 ldrlt r1, [r1]72 ldrlt r1, [r1]
73 blt ff_float_to_int16_neon73 blt X(ff_float_to_int16_neon)
74 bne 4f74 bne 4f
75 75
76 ldr r3, [r1]76 ldr r3, [r1]
libavcodec/arm/h264idct_neon.S+8−8
@@ -113,8 +113,8 @@ function ff_h264_idct_add16_neon, export=1 · 112 unmodified lines
113 movne lr, #0113 movne lr, #0
114 cmp lr, #0114 cmp lr, #0
115 ite ne115 ite ne
116 adrne lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB116 adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
117 adreq lr, ff_h264_idct_add_neon + CONFIG_THUMB117 adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
118 blx lr118 blx lr
1192: subs ip, ip, #11192: subs ip, ip, #1
120 add r1, r1, #32120 add r1, r1, #32
@@ -138,8 +138,8 @@ function ff_h264_idct_add16intra_neon, export=1 · 17 unmodified lines
138 cmp r8, #0138 cmp r8, #0
139 ldrsh r8, [r1]139 ldrsh r8, [r1]
140 iteet ne140 iteet ne
141 adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB141 adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
142 adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB142 adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
143 cmpeq r8, #0143 cmpeq r8, #0
144 blxne lr144 blxne lr
145 subs ip, ip, #1145 subs ip, ip, #1
@@ -166,8 +166,8 @@ function ff_h264_idct_add8_neon, export=1 · 20 unmodified lines
166 cmp r8, #0166 cmp r8, #0
167 ldrsh r8, [r1]167 ldrsh r8, [r1]
168 iteet ne168 iteet ne
169 adrne lr, ff_h264_idct_add_neon + CONFIG_THUMB169 adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB
170 adreq lr, ff_h264_idct_dc_add_neon + CONFIG_THUMB170 adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB
171 cmpeq r8, #0171 cmpeq r8, #0
172 blxne lr172 blxne lr
173 add r12, r12, #1173 add r12, r12, #1
@@ -388,8 +388,8 @@ function ff_h264_idct8_add4_neon, export=1 · 214 unmodified lines
388 movne lr, #0388 movne lr, #0
389 cmp lr, #0389 cmp lr, #0
390 ite ne390 ite ne
391 adrne lr, ff_h264_idct8_dc_add_neon + CONFIG_THUMB391 adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB
392 adreq lr, ff_h264_idct8_add_neon + CONFIG_THUMB392 adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB
393 blx lr393 blx lr
3942: subs r12, r12, #43942: subs r12, r12, #4
395 add r1, r1, #128395 add r1, r1, #128
libavcodec/arm/hpeldsp_armv6.S+2−2
@@ -23,11 +23,11 @@ · 22 unmodified lines
23.macro call_2x_pixels type, subp23.macro call_2x_pixels type, subp
24function ff_\type\()_pixels16\subp\()_armv6, export=124function ff_\type\()_pixels16\subp\()_armv6, export=1
25 push {r0-r3, lr}25 push {r0-r3, lr}
26 bl ff_\type\()_pixels8\subp\()_armv626 bl X(ff_\type\()_pixels8\subp\()_armv6)
27 pop {r0-r3, lr}27 pop {r0-r3, lr}
28 add r0, r0, #828 add r0, r0, #8
29 add r1, r1, #829 add r1, r1, #8
30 b ff_\type\()_pixels8\subp\()_armv630 b X(ff_\type\()_pixels8\subp\()_armv6)
31endfunc31endfunc
32.endm32.endm
33 33
libavcodec/arm/mdct_neon.S+1−1
@@ -129,7 +129,7 @@ function ff_imdct_calc_neon, export=1 · 128 unmodified lines
129 lsl r4, r4, r3129 lsl r4, r4, r3
130 add r1, r1, r4130 add r1, r1, r4
131 131
132 bl ff_imdct_half_neon132 bl X(ff_imdct_half_neon)
133 133
134 add r0, r5, r4, lsl #2134 add r0, r5, r4, lsl #2
135 add r1, r5, r4, lsl #1135 add r1, r5, r4, lsl #1
libavcodec/arm/mpegvideo_neon.S+1−1
@@ -100,7 +100,7 @@ function ff_dct_unquantize_h263_intra_neon, export=1 · 99 unmodified lines
100 smulbb r4, r4, r6100 smulbb r4, r4, r6
1012: lsl r0, r3, #11012: lsl r0, r3, #1
102 add r3, r12, #1102 add r3, r12, #1
103 bl ff_dct_unquantize_h263_neon103 bl X(ff_dct_unquantize_h263_neon)
104 vmov.16 d0[0], r4104 vmov.16 d0[0], r4
105 vst1.16 {d0[0]}, [r5]105 vst1.16 {d0[0]}, [r5]
106 pop {r4-r6,pc}106 pop {r4-r6,pc}
libavcodec/arm/videodsp_armv5te.S+1−1
@@ -26,6 +26,6 @@ function ff_prefetch_arm, export=1 · 25 unmodified lines
26 subs r2, r2, #126 subs r2, r2, #1
27 pld [r0]27 pld [r0]
28 add r0, r0, r128 add r0, r0, r1
29 bne ff_prefetch_arm29 bne X(ff_prefetch_arm)
30 bx lr30 bx lr
31endfunc31endfunc
libavcodec/arm/vp8dsp_armv6.S+8−8
@@ -359,14 +359,14 @@ endfunc · 358 unmodified lines
359function ff_vp8_idct_dc_add4uv_armv6, export=1359function ff_vp8_idct_dc_add4uv_armv6, export=1
360 push {r4, lr}360 push {r4, lr}
361 361
362 bl ff_vp8_idct_dc_add_armv6362 bl X(ff_vp8_idct_dc_add_armv6)
363 add r0, r0, #4363 add r0, r0, #4
364 bl ff_vp8_idct_dc_add_armv6364 bl X(ff_vp8_idct_dc_add_armv6)
365 add r0, r0, r2, lsl #2365 add r0, r0, r2, lsl #2
366 sub r0, r0, #4366 sub r0, r0, #4
367 bl ff_vp8_idct_dc_add_armv6367 bl X(ff_vp8_idct_dc_add_armv6)
368 add r0, r0, #4368 add r0, r0, #4
369 bl ff_vp8_idct_dc_add_armv6369 bl X(ff_vp8_idct_dc_add_armv6)
370 370
371 pop {r4, pc}371 pop {r4, pc}
372endfunc372endfunc
@@ -375,13 +375,13 @@ endfunc · 2 unmodified lines
375function ff_vp8_idct_dc_add4y_armv6, export=1375function ff_vp8_idct_dc_add4y_armv6, export=1
376 push {r4, lr}376 push {r4, lr}
377 377
378 bl ff_vp8_idct_dc_add_armv6378 bl X(ff_vp8_idct_dc_add_armv6)
379 add r0, r0, #4379 add r0, r0, #4
380 bl ff_vp8_idct_dc_add_armv6380 bl X(ff_vp8_idct_dc_add_armv6)
381 add r0, r0, #4381 add r0, r0, #4
382 bl ff_vp8_idct_dc_add_armv6382 bl X(ff_vp8_idct_dc_add_armv6)
383 add r0, r0, #4383 add r0, r0, #4
384 bl ff_vp8_idct_dc_add_armv6384 bl X(ff_vp8_idct_dc_add_armv6)
385 385
386 pop {r4, pc}386 pop {r4, pc}
387endfunc387endfunc
libavresample/arm/audio_convert_neon.S+2−2
@@ -133,8 +133,8 @@ function ff_conv_fltp_to_s16_neon, export=1 · 132 unmodified lines
133 cmp r3, #2133 cmp r3, #2
134 itt lt134 itt lt
135 ldrlt r1, [r1]135 ldrlt r1, [r1]
136 blt ff_conv_flt_to_s16_neon136 blt X(ff_conv_flt_to_s16_neon)
137 beq ff_conv_fltp_to_s16_2ch_neon137 beq X(ff_conv_fltp_to_s16_2ch_neon)
138 138
139 push {r4-r8, lr}139 push {r4-r8, lr}
140 cmp r3, #4140 cmp r3, #4

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