diff options
author | Graeme Gregory <dp@xora.org.uk> | 2009-09-17 22:23:09 +0100 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2009-09-17 22:23:09 +0100 |
commit | 0159d8fb1eca071c9fd74c2fc99e3ef8b4c38085 (patch) | |
tree | 1660b8cc1e3246df359dc219db9fd249f23bea06 /recipes/mplayer/files | |
parent | b0a80126c9dce4500a2c5da945fdb53aecf2a507 (diff) |
mplayer/files/pld-onlyarm5-svn.patch : refresh for newest svn
Diffstat (limited to 'recipes/mplayer/files')
-rw-r--r-- | recipes/mplayer/files/pld-onlyarm5-svn.patch | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/recipes/mplayer/files/pld-onlyarm5-svn.patch b/recipes/mplayer/files/pld-onlyarm5-svn.patch index 0924060c6c..349fb9df90 100644 --- a/recipes/mplayer/files/pld-onlyarm5-svn.patch +++ b/recipes/mplayer/files/pld-onlyarm5-svn.patch @@ -1,7 +1,9 @@ ---- MPlayer-1.0pre8/libavcodec/arm/dsputil_arm_s.S.orig 2006-07-03 09:53:33.000000000 +0100 -+++ MPlayer-1.0pre8/libavcodec/arm/dsputil_arm_s.S 2006-07-03 10:06:58.000000000 +0100 -@@ -16,6 +16,13 @@ - @ License along with this library; if not, write to the Free Software +Index: trunk/libavcodec/arm/dsputil_arm_s.S +=================================================================== +--- trunk.orig/libavcodec/arm/dsputil_arm_s.S ++++ trunk/libavcodec/arm/dsputil_arm_s.S +@@ -18,6 +18,13 @@ + @ License along with FFmpeg; if not, write to the Free Software @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @ +#if defined(__ARM_ARCH_5__) || \ @@ -12,18 +14,17 @@ +#define PLD(code...) +#endif - .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 - mov \Rd0, \Rn0, lsr #(\shift * 8) -@@ -74,7 +81,7 @@ - put_pixels16_arm: + #include "config.h" + #include "asm.S" +@@ -106,14 +113,14 @@ function ff_prefetch_arm, export=1 + function put_pixels16_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r11, lr} @ R14 is also called LR - adr r5, 5f - ands r4, r1, #3 -@@ -85,7 +92,7 @@ + JMP_ALIGN r5, r1 + 1: ldmia r1, {r4-r7} add r1, r1, r2 stmia r0, {r4-r7} @@ -32,7 +33,7 @@ subs r3, r3, #1 add r0, r0, r2 bne 1b -@@ -95,7 +102,7 @@ +@@ -123,7 +130,7 @@ function put_pixels16_arm, export=1 ldmia r1, {r4-r8} add r1, r1, r2 ADJ_ALIGN_QUADWORD_D 1, r9, r10, r11, r12, r4, r5, r6, r7, r8 @@ -41,7 +42,7 @@ subs r3, r3, #1 stmia r0, {r9-r12} add r0, r0, r2 -@@ -106,7 +113,7 @@ +@@ -134,7 +141,7 @@ function put_pixels16_arm, export=1 ldmia r1, {r4-r8} add r1, r1, r2 ADJ_ALIGN_QUADWORD_D 2, r9, r10, r11, r12, r4, r5, r6, r7, r8 @@ -50,7 +51,7 @@ subs r3, r3, #1 stmia r0, {r9-r12} add r0, r0, r2 -@@ -117,7 +124,7 @@ +@@ -145,7 +152,7 @@ function put_pixels16_arm, export=1 ldmia r1, {r4-r8} add r1, r1, r2 ADJ_ALIGN_QUADWORD_D 3, r9, r10, r11, r12, r4, r5, r6, r7, r8 @@ -59,16 +60,15 @@ subs r3, r3, #1 stmia r0, {r9-r12} add r0, r0, r2 -@@ -136,7 +143,7 @@ - put_pixels8_arm: +@@ -158,14 +165,14 @@ function put_pixels16_arm, export=1 + function put_pixels8_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r5,lr} @ R14 is also called LR - adr r5, 5f - ands r4, r1, #3 -@@ -147,7 +154,7 @@ + JMP_ALIGN r5, r1 + 1: ldmia r1, {r4-r5} add r1, r1, r2 subs r3, r3, #1 @@ -77,7 +77,7 @@ stmia r0, {r4-r5} add r0, r0, r2 bne 1b -@@ -157,7 +164,7 @@ +@@ -175,7 +182,7 @@ function put_pixels8_arm, export=1 ldmia r1, {r4-r5, r12} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r12 @@ -86,7 +86,7 @@ subs r3, r3, #1 stmia r0, {r4-r5} add r0, r0, r2 -@@ -168,7 +175,7 @@ +@@ -186,7 +193,7 @@ function put_pixels8_arm, export=1 ldmia r1, {r4-r5, r12} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r12 @@ -95,7 +95,7 @@ subs r3, r3, #1 stmia r0, {r4-r5} add r0, r0, r2 -@@ -179,7 +186,7 @@ +@@ -197,7 +204,7 @@ function put_pixels8_arm, export=1 ldmia r1, {r4-r5, r12} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r12 @@ -104,16 +104,16 @@ subs r3, r3, #1 stmia r0, {r4-r5} add r0, r0, r2 -@@ -198,7 +205,7 @@ - put_pixels8_x2_arm: +@@ -210,7 +217,7 @@ function put_pixels8_arm, export=1 + function put_pixels8_x2_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r10,lr} @ R14 is also called LR - adr r5, 5f - ands r4, r1, #3 -@@ -210,7 +217,7 @@ + ldr r12, =0xfefefefe + JMP_ALIGN r5, r1 +@@ -218,7 +225,7 @@ function put_pixels8_x2_arm, export=1 ldmia r1, {r4-r5, r10} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 @@ -122,7 +122,7 @@ RND_AVG32 r8, r9, r4, r5, r6, r7, r12 subs r3, r3, #1 stmia r0, {r8-r9} -@@ -223,7 +230,7 @@ +@@ -231,7 +238,7 @@ function put_pixels8_x2_arm, export=1 add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 @@ -131,7 +131,7 @@ RND_AVG32 r4, r5, r6, r7, r8, r9, r12 subs r3, r3, #1 stmia r0, {r4-r5} -@@ -236,7 +243,7 @@ +@@ -244,7 +251,7 @@ function put_pixels8_x2_arm, export=1 add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 @@ -140,7 +140,7 @@ RND_AVG32 r4, r5, r6, r7, r8, r9, r12 subs r3, r3, #1 stmia r0, {r4-r5} -@@ -248,7 +255,7 @@ +@@ -256,7 +263,7 @@ function put_pixels8_x2_arm, export=1 ldmia r1, {r4-r5, r10} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 @@ -149,16 +149,16 @@ RND_AVG32 r8, r9, r6, r7, r5, r10, r12 subs r3, r3, #1 stmia r0, {r8-r9} -@@ -267,7 +274,7 @@ - put_no_rnd_pixels8_x2_arm: +@@ -269,7 +276,7 @@ function put_pixels8_x2_arm, export=1 + function put_no_rnd_pixels8_x2_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r10,lr} @ R14 is also called LR - adr r5, 5f - ands r4, r1, #3 -@@ -279,7 +286,7 @@ + ldr r12, =0xfefefefe + JMP_ALIGN r5, r1 +@@ -277,7 +284,7 @@ function put_no_rnd_pixels8_x2_arm, expo ldmia r1, {r4-r5, r10} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 @@ -167,7 +167,7 @@ NO_RND_AVG32 r8, r9, r4, r5, r6, r7, r12 subs r3, r3, #1 stmia r0, {r8-r9} -@@ -292,7 +299,7 @@ +@@ -290,7 +297,7 @@ function put_no_rnd_pixels8_x2_arm, expo add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 1, r6, r7, r4, r5, r10 ADJ_ALIGN_DOUBLEWORD_D 2, r8, r9, r4, r5, r10 @@ -176,7 +176,7 @@ NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 subs r3, r3, #1 stmia r0, {r4-r5} -@@ -305,7 +312,7 @@ +@@ -303,7 +310,7 @@ function put_no_rnd_pixels8_x2_arm, expo add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 2, r6, r7, r4, r5, r10 ADJ_ALIGN_DOUBLEWORD_D 3, r8, r9, r4, r5, r10 @@ -185,7 +185,7 @@ NO_RND_AVG32 r4, r5, r6, r7, r8, r9, r12 subs r3, r3, #1 stmia r0, {r4-r5} -@@ -317,7 +324,7 @@ +@@ -315,7 +322,7 @@ function put_no_rnd_pixels8_x2_arm, expo ldmia r1, {r4-r5, r10} add r1, r1, r2 ADJ_ALIGN_DOUBLEWORD_D 3, r6, r7, r4, r5, r10 @@ -194,16 +194,16 @@ NO_RND_AVG32 r8, r9, r6, r7, r5, r10, r12 subs r3, r3, #1 stmia r0, {r8-r9} -@@ -338,7 +345,7 @@ - put_pixels8_y2_arm: +@@ -330,7 +337,7 @@ function put_no_rnd_pixels8_x2_arm, expo + function put_pixels8_y2_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r11,lr} @ R14 is also called LR - adr r5, 5f - ands r4, r1, #3 -@@ -352,13 +359,13 @@ + mov r3, r3, lsr #1 + ldr r12, =0xfefefefe +@@ -340,13 +347,13 @@ function put_pixels8_y2_arm, export=1 add r1, r1, r2 6: ldmia r1, {r6-r7} add r1, r1, r2 @@ -219,7 +219,7 @@ RND_AVG32 r8, r9, r6, r7, r4, r5, r12 subs r3, r3, #1 stmia r0, {r8-r9} -@@ -369,18 +376,18 @@ +@@ -357,18 +364,18 @@ function put_pixels8_y2_arm, export=1 2: ldmia r1, {r4-r6} add r1, r1, r2 @@ -241,7 +241,7 @@ ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 subs r3, r3, #1 RND_AVG32 r10, r11, r7, r8, r4, r5, r12 -@@ -392,18 +399,18 @@ +@@ -380,18 +387,18 @@ function put_pixels8_y2_arm, export=1 3: ldmia r1, {r4-r6} add r1, r1, r2 @@ -263,7 +263,7 @@ ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 subs r3, r3, #1 RND_AVG32 r10, r11, r7, r8, r4, r5, r12 -@@ -415,18 +422,18 @@ +@@ -403,18 +410,18 @@ function put_pixels8_y2_arm, export=1 4: ldmia r1, {r4-r6} add r1, r1, r2 @@ -285,16 +285,16 @@ ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 subs r3, r3, #1 RND_AVG32 r10, r11, r7, r8, r4, r5, r12 -@@ -447,7 +454,7 @@ - put_no_rnd_pixels8_y2_arm: +@@ -428,7 +435,7 @@ function put_pixels8_y2_arm, export=1 + function put_no_rnd_pixels8_y2_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r11,lr} @ R14 is also called LR - adr r5, 5f - ands r4, r1, #3 -@@ -461,13 +468,13 @@ + mov r3, r3, lsr #1 + ldr r12, =0xfefefefe +@@ -438,13 +445,13 @@ function put_no_rnd_pixels8_y2_arm, expo add r1, r1, r2 6: ldmia r1, {r6-r7} add r1, r1, r2 @@ -310,7 +310,7 @@ NO_RND_AVG32 r8, r9, r6, r7, r4, r5, r12 subs r3, r3, #1 stmia r0, {r8-r9} -@@ -478,18 +485,18 @@ +@@ -455,18 +462,18 @@ function put_no_rnd_pixels8_y2_arm, expo 2: ldmia r1, {r4-r6} add r1, r1, r2 @@ -332,7 +332,7 @@ ADJ_ALIGN_DOUBLEWORD 1, r4, r5, r6 subs r3, r3, #1 NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 -@@ -501,18 +508,18 @@ +@@ -478,18 +485,18 @@ function put_no_rnd_pixels8_y2_arm, expo 3: ldmia r1, {r4-r6} add r1, r1, r2 @@ -354,7 +354,7 @@ ADJ_ALIGN_DOUBLEWORD 2, r4, r5, r6 subs r3, r3, #1 NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 -@@ -524,18 +531,18 @@ +@@ -501,18 +508,18 @@ function put_no_rnd_pixels8_y2_arm, expo 4: ldmia r1, {r4-r6} add r1, r1, r2 @@ -376,7 +376,7 @@ ADJ_ALIGN_DOUBLEWORD 3, r4, r5, r6 subs r3, r3, #1 NO_RND_AVG32 r10, r11, r7, r8, r4, r5, r12 -@@ -562,7 +569,7 @@ +@@ -536,7 +543,7 @@ function put_no_rnd_pixels8_y2_arm, expo ldmia r1, {r8-r10} .endif add r1, r1, r2 @@ -385,21 +385,21 @@ .if \align == 0 ADJ_ALIGN_DOUBLEWORD_D 1, r4, r5, r6, r7, r8 .elseif \align == 1 -@@ -624,7 +631,7 @@ - put_pixels8_xy2_arm: +@@ -593,7 +600,7 @@ function put_no_rnd_pixels8_y2_arm, expo + function put_pixels8_xy2_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r11,lr} @ R14 is also called LR - adrl r12, 5f - ands r4, r1, #3 -@@ -661,7 +668,7 @@ - put_no_rnd_pixels8_xy2_arm: + JMP_ALIGN r5, r1 + 1: +@@ -616,7 +623,7 @@ function put_pixels8_xy2_arm, export=1 + function put_no_rnd_pixels8_xy2_arm, export=1 @ void func(uint8_t *block, const uint8_t *pixels, int line_size, int h) @ block = word aligned, pixles = unaligned - pld [r1] + PLD ( pld [r1] ) stmfd sp!, {r4-r11,lr} @ R14 is also called LR - adrl r12, 5f - ands r4, r1, #3 + JMP_ALIGN r5, r1 + 1: |