package/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch

   1 Date: Mon, 1 Aug 2011 20:21:04 +0300
   2 Subject: [libavcodec] arm: Avoid using the movw instruction needlessly
   3 MIME-Version: 1.0
   4 Content-Type: text/plain; charset=utf8
   5 Content-Transfer-Encoding: 8bit
   6
   7 This fixes building for ARM11 without Thumb2.
   8
   9 Signed-off-by: Martin Storsjö <martin@martin.st>
  10
  11 [Arnout: backported to gst-ffmpeg, from ffmpeg 9a83adaf3]
  12 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
  13 ---
  14  gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S |    4 ++--
  15  1 file changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
  18 index d3058ff..b6aee86 100644
  19 --- a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
  20 +++ b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S
  21 @@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
  22          ldrb            r10, [r4], #1
  23  1:
  24          ldrsh           r9,  [r0], #2                   @ mask[band]
  25 -        movw            r8,  #0x1fe0
  26 +        mov             r8,  #0xff0
  27          sub             r9,  r9,  r12                   @   - snr_offset
  28          mov             r11, r10
  29          ldrb            r10, [r4], #1                   @ band_start_tab[band++]
  30 @@ -44,7 +44,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
  31          subs            r9,  r9,  r5                    @   - floor
  32          movlt           r9,  #0
  33          cmp             r10, r3                         @   - end
  34 -        and             r9,  r9,  r8                    @   & 0x1fe0
  35 +        and             r9,  r9,  r8, lsl #1            @   & 0x1fe0
  36          subgt           r8,  r3,  r11
  37          suble           r8,  r10, r11
  38          add             r9,  r9,  r5                    @   + floor => m
  39 --
  40 1.7.10.4
  41