On Mon, Aug 01, 2011 at 03:29:07PM +0100, Måns Rullgård wrote: > Martin Storsjö <[email protected]> writes: > > > This fixes building for iPhone 2G/3G (with --cpu=arm1176jzf-s). > > You might say simply that it fixes ARM11. > > > --- > > libavcodec/arm/ac3dsp_armv6.S | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S > > index d3058ff..30ff418 100644 > > --- a/libavcodec/arm/ac3dsp_armv6.S > > +++ b/libavcodec/arm/ac3dsp_armv6.S > > @@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 > > ldrb r10, [r4], #1 > > 1: > > ldrsh r9, [r0], #2 @ mask[band] > > - movw r8, #0x1fe0 > > + mov32 r8, 0x1fe0 > > sub r9, r9, r12 @ - snr_offset > > mov r11, r10 > > ldrb r10, [r4], #1 @ > > band_start_tab[band++] > > -- > > Try this patch instead: > > diff --git a/libavcodec/arm/ac3dsp_armv6.S b/libavcodec/arm/ac3dsp_armv6.S > index d3058ff..5c1486c 100644 > --- a/libavcodec/arm/ac3dsp_armv6.S > +++ b/libavcodec/arm/ac3dsp_armv6.S > @@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 > ldrb r10, [r4], #1 > 1: > ldrsh r9, [r0], #2 @ mask[band] > - movw r8, #0x1fe0 > + mov r8, #0xff > sub r9, r9, r12 @ - snr_offset > mov r11, r10 > ldrb r10, [r4], #1 @ > band_start_tab[band++] > @@ -45,7 +45,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 > it lt > movlt r9, #0 > cmp r10, r3 @ - end > - and r9, r9, r8 @ & 0x1fe0 > + and r9, r9, r8, lsl #1 @ & 0x1fe0
shouldn't it be #5 instead? _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
