mplayer: update to a more recent svn versions, enable theora and dvd support

15 files changed, 522 insertions, 3265 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cc367f8b26..67b0f9b972 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -114,7 +114,7 @@ SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27659"
+SRCREV_pn-mplayer ?= "28311"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-multitap-pad ?= "373"
diff --git a/packages/mplayer/files/mru-neon-float-to-int16.diff b/packages/mplayer/files/mru-neon-float-to-int16.diff
deleted file mode 100644
index 7a874cab30..0000000000
--- a/packages/mplayer/files/mru-neon-float-to-int16.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Mans Rullgard <mans@mansr.com>
-Date: Thu, 31 Jul 2008 02:35:42 +0000 (+0100)
-Subject: ARM: NEON optimised float_to_int16
-X-Git-Url: http://git.mansr.com/?p=ffmpeg.mru;a=commitdiff_plain;h=f16a738cfc3307cbcba2f9c8aff4b5aa43144731
-
-ARM: NEON optimised float_to_int16
----
-
-diff --git a/libavcodec/armv4l/dsputil_neon.c b/libavcodec/armv4l/dsputil_neon.c
-index 6dbe835..b584e5b 100644
---- a/libavcodec/armv4l/dsputil_neon.c
-+++ b/libavcodec/armv4l/dsputil_neon.c
-@@ -91,6 +91,9 @@ void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
- void ff_h264_idct_add_neon(uint8_t *dst, DCTELEM *block, int stride);
- void ff_h264_idct_dc_add_neon(uint8_t *dst, DCTELEM *block, int stride);
- 
-+void ff_float_to_int16_neon(int16_t *, const float *, long);
-+void ff_float_to_int16_interleave_neon(int16_t *, const float **, long, int);
-+
- void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
- {
-     c->put_pixels_tab[0][0] = ff_put_pixels16_neon;
-@@ -158,4 +161,7 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
- 
-     c->h264_idct_add = ff_h264_idct_add_neon;
-     c->h264_idct_dc_add = ff_h264_idct_dc_add_neon;
-+
-+    c->float_to_int16 = ff_float_to_int16_neon;
-+    c->float_to_int16_interleave = ff_float_to_int16_interleave_neon;
- }
-diff --git a/libavcodec/armv4l/dsputil_neon_s.S b/libavcodec/armv4l/dsputil_neon_s.S
-index fc5e401..44f75ba 100644
---- a/libavcodec/armv4l/dsputil_neon_s.S
-+++ b/libavcodec/armv4l/dsputil_neon_s.S
-@@ -252,3 +252,72 @@
-         defun2 put_pixels8_x2,   _no_rnd, vhadd.u8
-         defun2 put_pixels8_y2,   _no_rnd, vhadd.u8
-         defun2 put_pixels8_xy2,  _no_rnd, vshrn.u16, 1
-+
-+extern ff_float_to_int16_neon
-+        dmb
-+1:      vld1.64       {d0-d3}, [r1,:128]!
-+        vcvt.s32.f32  q2, q0
-+        vcvt.s32.f32  q3, q1
-+        subs          r2, r2, #8
-+        vqmovn.s32    d4, q2
-+        vqmovn.s32    d5, q3
-+        vst1.64       {d4-d5}, [r0,:128]!
-+        bgt           1b
-+        bx            lr
-+        .endfunc
-+
-+extern ff_float_to_int16_interleave_neon
-+        cmp           r3, #2
-+        ldrlt         r1, [r1]
-+        blt           ff_float_to_int16_neon
-+        bne           2f
-+
-+        ldr           ip, [r1]
-+        ldr           r1, [r1, #4]
-+        vld1.64       {d0-d3}, [ip,:128]!
-+        vld1.64       {d4-d7}, [r1,:128]!
-+        dmb
-+1:      vcvt.s32.f32  q8,  q0
-+        vcvt.s32.f32  q9,  q1
-+        vcvt.s32.f32  q10, q2
-+        vcvt.s32.f32  q11, q3
-+        subs          r2, r2, #8
-+        vqmovn.s32    d16, q8
-+        vqmovn.s32    d17, q9
-+        vqmovn.s32    d18, q10
-+        vqmovn.s32    d19, q11
-+        beq           1f
-+        vld1.64       {d0-d3}, [ip,:128]!
-+        vld1.64       {d4-d7}, [r1,:128]!
-+        vst2.16       {d16-d19}, [r0,:64]!
-+        b             1b
-+1:      vst2.16       {d16-d19}, [r0,:64]!
-+        bx            lr
-+
-+2:      push          {r4,r5,lr}
-+        lsls          r4, r3, #1
-+        dmb
-+        b             4f
-+3:      vld1.64       {d0-d3}, [ip,:128]!
-+        vcvt.s32.f32  q2, q0
-+        vcvt.s32.f32  q3, q1
-+        subs          lr, lr, #8
-+        vqmovn.s32    d4, q2
-+        vqmovn.s32    d5, q3
-+        vst1.16       {d4[0]}, [r5,:16], r4
-+        vst1.16       {d4[1]}, [r5,:16], r4
-+        vst1.16       {d4[2]}, [r5,:16], r4
-+        vst1.16       {d4[3]}, [r5,:16], r4
-+        vst1.16       {d5[0]}, [r5,:16], r4
-+        vst1.16       {d5[1]}, [r5,:16], r4
-+        vst1.16       {d5[2]}, [r5,:16], r4
-+        vst1.16       {d5[3]}, [r5,:16], r4
-+        bgt           3b
-+        subs          r3, r3, #1
-+4:      ldr           ip, [r1], #4
-+        mov           lr, r2
-+        mov           r5, r0
-+        add           r0, r0, #2
-+        bne           3b
-+        pop           {r4,r5,pc}
-+        .endfunc
diff --git a/packages/mplayer/files/mru-neon-h264-chrome.diff b/packages/mplayer/files/mru-neon-h264-chrome.diff
deleted file mode 100644
index cb6c4ff991..0000000000
--- a/packages/mplayer/files/mru-neon-h264-chrome.diff
+++ /dev/null
@@ -1,364 +0,0 @@
-From: Mans Rullgard <mans@mansr.com>
-Date: Fri, 11 Jul 2008 01:20:07 +0000 (+0100)
-Subject: ARM: NEON optimised {put,avg}_h264_chroma_mc[48]
-X-Git-Url: http://git.mansr.com/?p=ffmpeg.mru;a=commitdiff_plain;h=d3aa8f93b8a0061e0c3ac12aeed055961abfc113
-
-ARM: NEON optimised {put,avg}_h264_chroma_mc[48]
----
-
-diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 7fa02fa..36ba158 100644
---- a/libavcodec/Makefile
-+++ b/libavcodec/Makefile
-@@ -437,6 +437,7 @@ OBJS-$(HAVE_NEON)                      += armv4l/dsputil_neon.o \
- 
- ASM_OBJS-$(HAVE_NEON)                  += armv4l/dsputil_neon_s.o   \
-                                           armv4l/simple_idct_neon.o \
-+                                          armv4l/h264dsp_neon.o     \
- 
- OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o \
-                                           sparc/simple_idct_vis.o \
-diff --git a/libavcodec/armv4l/dsputil_neon.c b/libavcodec/armv4l/dsputil_neon.c
-index 8a10dde..a6d86cd 100644
---- a/libavcodec/armv4l/dsputil_neon.c
-+++ b/libavcodec/armv4l/dsputil_neon.c
-@@ -42,6 +42,12 @@ void ff_put_pixels8_xy2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
- void ff_put_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, int);
- void ff_put_h264_qpel8_mc00_neon(uint8_t *, uint8_t *, int);
- 
-+void ff_put_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
-+void ff_put_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
-+
-+void ff_avg_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
-+void ff_avg_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
-+
- void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
- {
-     c->put_pixels_tab[0][0] = ff_put_pixels16_neon;
-@@ -62,6 +68,12 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
-     c->put_no_rnd_pixels_tab[1][2] = ff_put_pixels8_y2_no_rnd_neon;
-     c->put_no_rnd_pixels_tab[1][3] = ff_put_pixels8_xy2_no_rnd_neon;
- 
-+    c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon;
-+    c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_neon;
-+
-+    c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_neon;
-+    c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_neon;
-+
-     c->put_h264_qpel_pixels_tab[0][0] = ff_put_h264_qpel16_mc00_neon;
-     c->put_h264_qpel_pixels_tab[1][0] = ff_put_h264_qpel8_mc00_neon;
- }
-diff --git a/libavcodec/armv4l/h264dsp_neon.S b/libavcodec/armv4l/h264dsp_neon.S
-new file mode 100644
-index 0000000..28d9aa7
---- /dev/null
-+++ b/libavcodec/armv4l/h264dsp_neon.S
-@@ -0,0 +1,308 @@
-+/*
-+ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+        .fpu neon
-+
-+/* chroma_mc8(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */
-+        .macro  h264_chroma_mc8 avg=0
-+        push            {r4-r7, lr}
-+        ldrd            r4,  [sp, #20]
-+.if \avg
-+        mov             lr,  r0
-+.endif
-+        pld             [r1]
-+        pld             [r1, r2]
-+
-+        muls            r7,  r4,  r5
-+        rsb             r6,  r7,  r5,  lsl #3
-+        rsb             ip,  r7,  r4,  lsl #3
-+        sub             r4,  r7,  r4,  lsl #3
-+        sub             r4,  r4,  r5,  lsl #3
-+        add             r4,  r4,  #64
-+
-+        dmb
-+
-+        beq             2f
-+
-+        add             r5,  r1,  r2
-+
-+        vdup.8          d0,  r4
-+        lsl             r4,  r2,  #1
-+        vdup.8          d1,  ip
-+        vld1.64         {d4, d5}, [r1], r4
-+        vdup.8          d2,  r6
-+        vld1.64         {d6, d7}, [r5], r4
-+        vdup.8          d3,  r7
-+
-+        vext.8          d5,  d4,  d5,  #1
-+        vext.8          d7,  d6,  d7,  #1
-+
-+1:      pld             [r5]
-+        vmull.u8        q8,  d4,  d0
-+        vmlal.u8        q8,  d5,  d1
-+        vld1.64         {d4, d5}, [r1], r4
-+        vmlal.u8        q8,  d6,  d2
-+        vext.8          d5,  d4,  d5,  #1
-+        vmlal.u8        q8,  d7,  d3
-+        vmull.u8        q9,  d6,  d0
-+        subs            r3,  r3,  #2
-+        vmlal.u8        q9,  d7,  d1
-+        vmlal.u8        q9,  d4,  d2
-+        vmlal.u8        q9,  d5,  d3
-+        vrshrn.u16      d16, q8,  #6
-+        vld1.64         {d6, d7}, [r5], r4
-+        pld             [r1]
-+        vrshrn.u16      d17, q9,  #6
-+.if \avg
-+        vld1.64         {d20}, [lr,:64], r2
-+        vld1.64         {d21}, [lr,:64], r2
-+        vrhadd.u8       q8,  q8,  q10
-+.endif
-+        vext.8          d7,  d6,  d7,  #1
-+        vst1.64         {d16}, [r0,:64], r2
-+        vst1.64         {d17}, [r0,:64], r2
-+        bgt             1b
-+
-+        pop             {r4-r7, pc}
-+
-+2:      tst             r6,  r6
-+        add             ip,  ip,  r6
-+        vdup.8          d0,  r4
-+        vdup.8          d1,  ip
-+
-+        beq             4f
-+
-+        add             r5,  r1,  r2
-+        lsl             r4,  r2,  #1
-+        vld1.64         {d4}, [r1], r4
-+        vld1.64         {d6}, [r5], r4
-+
-+3:      pld             [r5]
-+        vmull.u8        q8,  d4,  d0
-+        vmlal.u8        q8,  d6,  d1
-+        vld1.64         {d4}, [r1], r4
-+        vmull.u8        q9,  d6,  d0
-+        vmlal.u8        q9,  d4,  d1
-+        vld1.64         {d6}, [r5], r4
-+        vrshrn.u16      d16, q8,  #6
-+        vrshrn.u16      d17, q9,  #6
-+.if \avg
-+        vld1.64         {d20}, [lr,:64], r2
-+        vld1.64         {d21}, [lr,:64], r2
-+        vrhadd.u8       q8,  q8,  q10
-+.endif
-+        subs            r3,  r3,  #2
-+        pld             [r1]
-+        vst1.64         {d16}, [r0,:64], r2
-+        vst1.64         {d17}, [r0,:64], r2
-+        bgt             3b
-+
-+        pop             {r4-r7, pc}
-+
-+4:      vld1.64         {d4, d5}, [r1], r2
-+        vld1.64         {d6, d7}, [r1], r2
-+        vext.8          d5,  d4,  d5,  #1
-+        vext.8          d7,  d6,  d7,  #1
-+
-+5:      pld             [r1]
-+        subs            r3,  r3,  #2
-+        vmull.u8        q8,  d4,  d0
-+        vmlal.u8        q8,  d5,  d1
-+        vld1.64         {d4, d5}, [r1], r2
-+        vmull.u8        q9,  d6,  d0
-+        vmlal.u8        q9,  d7,  d1
-+        pld             [r1]
-+        vext.8          d5,  d4,  d5,  #1
-+        vrshrn.u16      d16, q8,  #6
-+        vrshrn.u16      d17, q9,  #6
-+.if \avg
-+        vld1.64         {d20}, [lr,:64], r2
-+        vld1.64         {d21}, [lr,:64], r2
-+        vrhadd.u8       q8,  q8,  q10
-+.endif
-+        vld1.64         {d6, d7}, [r1], r2
-+        vext.8          d7,  d6,  d7,  #1
-+        vst1.64         {d16}, [r0,:64], r2
-+        vst1.64         {d17}, [r0,:64], r2
-+        bgt             5b
-+
-+        pop             {r4-r7, pc}
-+        .endm
-+
-+/* chroma_mc4(uint8_t *dst, uint8_t *src, int stride, int h, int x, int y) */
-+        .macro  h264_chroma_mc4 avg=0
-+        push            {r4-r7, lr}
-+        ldrd            r4,  [sp, #20]
-+.if \avg
-+        mov             lr,  r0
-+.endif
-+        pld             [r1]
-+        pld             [r1, r2]
-+
-+        muls            r7,  r4,  r5
-+        rsb             r6,  r7,  r5,  lsl #3
-+        rsb             ip,  r7,  r4,  lsl #3
-+        sub             r4,  r7,  r4,  lsl #3
-+        sub             r4,  r4,  r5,  lsl #3
-+        add             r4,  r4,  #64
-+
-+        dmb
-+
-+        beq             2f
-+
-+        add             r5,  r1,  r2
-+
-+        vdup.8          d0,  r4
-+        lsl             r4,  r2,  #1
-+        vdup.8          d1,  ip
-+        vld1.64         {d4},     [r1], r4
-+        vdup.8          d2,  r6
-+        vld1.64         {d6},     [r5], r4
-+        vdup.8          d3,  r7
-+
-+        vext.8          d5,  d4,  d5,  #1
-+        vext.8          d7,  d6,  d7,  #1
-+        vtrn.32         d4,  d5
-+        vtrn.32         d6,  d7
-+
-+        vtrn.32         d0,  d1
-+        vtrn.32         d2,  d3
-+
-+1:      pld             [r5]
-+        vmull.u8        q8,  d4,  d0
-+        vmlal.u8        q8,  d6,  d2
-+        vld1.64         {d4},     [r1], r4
-+        vext.8          d5,  d4,  d5,  #1
-+        vtrn.32         d4,  d5
-+        vmull.u8        q9,  d6,  d0
-+        vmlal.u8        q9,  d4,  d2
-+        vld1.64         {d6},     [r5], r4
-+        vadd.i16        d16, d16, d17
-+        vadd.i16        d17, d18, d19
-+        vrshrn.u16      d16, q8,  #6
-+        subs            r3,  r3,  #2
-+        pld             [r1]
-+.if \avg
-+        vld1.32         {d20[0]}, [lr,:32], r2
-+        vld1.32         {d20[1]}, [lr,:32], r2
-+        vrhadd.u8       d16, d16, d20
-+.endif
-+        vext.8          d7,  d6,  d7,  #1
-+        vtrn.32         d6,  d7
-+        vst1.32         {d16[0]}, [r0,:32], r2
-+        vst1.32         {d16[1]}, [r0,:32], r2
-+        bgt             1b
-+
-+        pop             {r4-r7, pc}
-+
-+2:      tst             r6,  r6
-+        add             ip,  ip,  r6
-+        vdup.8          d0,  r4
-+        vdup.8          d1,  ip
-+        vtrn.32         d0,  d1
-+
-+        beq             4f
-+
-+        vext.32         d1,  d0,  d1,  #1
-+        add             r5,  r1,  r2
-+        lsl             r4,  r2,  #1
-+        vld1.32         {d4[0]},  [r1], r4
-+        vld1.32         {d4[1]},  [r5], r4
-+
-+3:      pld             [r5]
-+        vmull.u8        q8,  d4,  d0
-+        vld1.32         {d4[0]},  [r1], r4
-+        vmull.u8        q9,  d4,  d1
-+        vld1.32         {d4[1]},  [r5], r4
-+        vadd.i16        d16, d16, d17
-+        vadd.i16        d17, d18, d19
-+        vrshrn.u16      d16, q8,  #6
-+.if \avg
-+        vld1.32         {d20[0]}, [lr,:32], r2
-+        vld1.32         {d20[1]}, [lr,:32], r2
-+        vrhadd.u8       d16, d16, d20
-+.endif
-+        subs            r3,  r3,  #2
-+        pld             [r1]
-+        vst1.32         {d16[0]}, [r0,:32], r2
-+        vst1.32         {d16[1]}, [r0,:32], r2
-+        bgt             3b
-+
-+        pop             {r4-r7, pc}
-+
-+4:      vld1.64         {d4},     [r1], r2
-+        vld1.64         {d6},     [r1], r2
-+        vext.8          d5,  d4,  d5,  #1
-+        vext.8          d7,  d6,  d7,  #1
-+        vtrn.32         d4,  d5
-+        vtrn.32         d6,  d7
-+
-+5:      vmull.u8        q8,  d4,  d0
-+        vmull.u8        q9,  d6,  d0
-+        subs            r3,  r3,  #2
-+        vld1.64         {d4},     [r1], r2
-+        vext.8          d5,  d4,  d5,  #1
-+        vtrn.32         d4,  d5
-+        vadd.i16        d16, d16, d17
-+        vadd.i16        d17, d18, d19
-+        pld             [r1]
-+        vrshrn.u16      d16, q8,  #6
-+.if \avg
-+        vld1.32         {d20[0]}, [lr,:32], r2
-+        vld1.32         {d20[1]}, [lr,:32], r2
-+        vrhadd.u8       d16, d16, d20
-+.endif
-+        vld1.64         {d6},     [r1], r2
-+        vext.8          d7,  d6,  d7,  #1
-+        vtrn.32         d6,  d7
-+        pld             [r1]
-+        vst1.32         {d16[0]}, [r0,:32], r2
-+        vst1.32         {d16[1]}, [r0,:32], r2
-+        bgt             5b
-+
-+        pop             {r4-r7, pc}
-+        .endm
-+
-+        .text
-+        .align
-+
-+        .global ff_put_h264_chroma_mc8_neon
-+        .func   ff_put_h264_chroma_mc8_neon
-+ff_put_h264_chroma_mc8_neon:
-+        h264_chroma_mc8
-+        .endfunc
-+
-+        .global ff_avg_h264_chroma_mc8_neon
-+        .func   ff_avg_h264_chroma_mc8_neon
-+ff_avg_h264_chroma_mc8_neon:
-+        h264_chroma_mc8 avg=1
-+        .endfunc
-+
-+        .global ff_put_h264_chroma_mc4_neon
-+        .func   ff_put_h264_chroma_mc4_neon
-+ff_put_h264_chroma_mc4_neon:
-+        h264_chroma_mc4
-+        .endfunc
-+
-+        .global ff_avg_h264_chroma_mc4_neon
-+        .func   ff_avg_h264_chroma_mc4_neon
-+ff_avg_h264_chroma_mc4_neon:
-+        h264_chroma_mc4 avg=1
-+        .endfunc
diff --git a/packages/mplayer/files/mru-neon-h264-loopfilter.diff b/packages/mplayer/files/mru-neon-h264-loopfilter.diff
deleted file mode 100644
index 056702517b..0000000000
--- a/packages/mplayer/files/mru-neon-h264-loopfilter.diff
+++ /dev/null
@@ -1,346 +0,0 @@
-From: Mans Rullgard <mans@mansr.com>
-Date: Fri, 15 Aug 2008 00:02:55 +0000 (+0100)
-Subject: ARM: NEON optimised H.264 loop filter
-X-Git-Url: http://git.mansr.com/?p=ffmpeg.mru;a=commitdiff_plain;h=0c1b6bb0814587bd4c8a895c6d7dc2dd4cc2841a
-
-ARM: NEON optimised H.264 loop filter
----
-
-diff --git a/libavcodec/armv4l/dsputil_neon.c b/libavcodec/armv4l/dsputil_neon.c
-index a6d86cd..68ecbe8 100644
---- a/libavcodec/armv4l/dsputil_neon.c
-+++ b/libavcodec/armv4l/dsputil_neon.c
-@@ -48,6 +48,15 @@ void ff_put_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
- void ff_avg_h264_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
- void ff_avg_h264_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
- 
-+void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
-+                                     int beta, int8_t *tc0);
-+void ff_h264_h_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha,
-+                                     int beta, int8_t *tc0);
-+void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
-+                                       int beta, int8_t *tc0);
-+void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha,
-+                                       int beta, int8_t *tc0);
-+
- void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
- {
-     c->put_pixels_tab[0][0] = ff_put_pixels16_neon;
-@@ -76,4 +85,9 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
- 
-     c->put_h264_qpel_pixels_tab[0][0] = ff_put_h264_qpel16_mc00_neon;
-     c->put_h264_qpel_pixels_tab[1][0] = ff_put_h264_qpel8_mc00_neon;
-+
-+    c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon;
-+    c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon;
-+    c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
-+    c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
- }
-diff --git a/libavcodec/armv4l/h264dsp_neon.S b/libavcodec/armv4l/h264dsp_neon.S
-index 28d9aa7..ac793b2 100644
---- a/libavcodec/armv4l/h264dsp_neon.S
-+++ b/libavcodec/armv4l/h264dsp_neon.S
-@@ -306,3 +306,303 @@ ff_put_h264_chroma_mc4_neon:
- ff_avg_h264_chroma_mc4_neon:
-         h264_chroma_mc4 avg=1
-         .endfunc
-+
-+        /* H.264 loop filter */
-+
-+        .macro h264_loop_filter_start
-+        ldr             ip,  [sp]
-+        tst             r2,  r2
-+        ldr             ip,  [ip]
-+        tstne           r3,  r3
-+        vmov.32         d24[0], ip
-+        and             ip,  ip,  ip, lsl #16
-+        bxeq            lr
-+        ands            ip,  ip,  ip, lsl #8
-+        bxlt            lr
-+        .endm
-+
-+        .macro align_push_regs
-+        and             ip,  sp,  #15
-+        add             ip,  ip,  #32
-+        sub             sp,  sp,  ip
-+        dmb
-+        vst1.64         {d12-d15}, [sp,:128]
-+        sub             sp,  sp,  #32
-+        vst1.64         {d8-d11},  [sp,:128]
-+        .endm
-+
-+        .macro align_pop_regs
-+        vld1.64         {d8-d11},  [sp,:128]!
-+        vld1.64         {d12-d15}, [sp,:128], ip
-+        .endm
-+
-+        .macro h264_loop_filter_luma
-+        vdup.8          q11, r2         @ alpha
-+        vmovl.u8        q12, d24
-+        vabd.u8         q6,  q8,  q0    @ abs(p0 - q0)
-+        vmovl.u16       q12, d24
-+        vabd.u8         q14, q9,  q8    @ abs(p1 - p0)
-+        vsli.16         q12, q12, #8
-+        vabd.u8         q15, q1,  q0    @ abs(q1 - q0)
-+        vsli.32         q12, q12, #16
-+        vclt.u8         q6,  q6,  q11   @ < alpha
-+        vdup.8          q11, r3         @ beta
-+        vclt.s8         q7,  q12, #0
-+        vclt.u8         q14, q14, q11   @ < beta
-+        vclt.u8         q15, q15, q11   @ < beta
-+        vbic            q6,  q6,  q7
-+        vabd.u8         q4,  q10, q8    @ abs(p2 - p0)
-+        vand            q6,  q6,  q14
-+        vabd.u8         q5,  q2,  q0    @ abs(q2 - q0)
-+        vclt.u8         q4,  q4,  q11   @ < beta
-+        vand            q6,  q6,  q15
-+        vclt.u8         q5,  q5,  q11   @ < beta
-+        vand            q4,  q4,  q6
-+        vand            q5,  q5,  q6
-+        vand            q12, q12, q6
-+        vrhadd.u8       q14, q8,  q0
-+        vsub.i8         q6,  q12, q4
-+        vqadd.u8        q7,  q9,  q12
-+        vhadd.u8        q10, q10, q14
-+        vsub.i8         q6,  q6,  q5
-+        vhadd.u8        q14, q2,  q14
-+        vmin.u8         q7,  q7,  q10
-+        vqsub.u8        q11, q9,  q12
-+        vqadd.u8        q2,  q1,  q12
-+        vmax.u8         q7,  q7,  q11
-+        vqsub.u8        q11, q1,  q12
-+        vmin.u8         q14, q2,  q14
-+        vmovl.u8        q2,  d0
-+        vmax.u8         q14, q14, q11
-+        vmovl.u8        q10, d1
-+        vsubw.u8        q2,  q2,  d16
-+        vsubw.u8        q10, q10, d17
-+        vshl.i16        q2,  q2,  #2
-+        vshl.i16        q10, q10, #2
-+        vaddw.u8        q2,  q2,  d18
-+        vaddw.u8        q10, q10, d19
-+        vsubw.u8        q2,  q2,  d2
-+        vsubw.u8        q10, q10, d3
-+        vrshrn.i16      d4,  q2,  #3
-+        vrshrn.i16      d5,  q10, #3
-+        vbsl            q4,  q7,  q9
-+        vbsl            q5,  q14, q1
-+        vneg.s8         q7,  q6
-+        vmovl.u8        q14, d16
-+        vmin.s8         q2,  q2,  q6
-+        vmovl.u8        q6,  d17
-+        vmax.s8         q2,  q2,  q7
-+        vmovl.u8        q11, d0
-+        vmovl.u8        q12, d1
-+        vaddw.s8        q14, q14, d4
-+        vaddw.s8        q6,  q6,  d5
-+        vsubw.s8        q11, q11, d4
-+        vsubw.s8        q12, q12, d5
-+        vqmovun.s16     d16, q14
-+        vqmovun.s16     d17, q6
-+        vqmovun.s16     d0,  q11
-+        vqmovun.s16     d1,  q12
-+        .endm
-+
-+        .global ff_h264_v_loop_filter_luma_neon
-+        .func   ff_h264_v_loop_filter_luma_neon
-+ff_h264_v_loop_filter_luma_neon:
-+        h264_loop_filter_start
-+
-+        vld1.64         {d0, d1},  [r0,:128], r1
-+        vld1.64         {d2, d3},  [r0,:128], r1
-+        vld1.64         {d4, d5},  [r0,:128], r1
-+        sub             r0,  r0,  r1, lsl #2
-+        sub             r0,  r0,  r1, lsl #1
-+        vld1.64         {d20,d21}, [r0,:128], r1
-+        vld1.64         {d18,d19}, [r0,:128], r1
-+        vld1.64         {d16,d17}, [r0,:128], r1
-+
-+        align_push_regs
-+
-+        h264_loop_filter_luma
-+
-+        sub             r0,  r0,  r1, lsl #1
-+        vst1.64         {d8, d9},  [r0,:128], r1
-+        vst1.64         {d16,d17}, [r0,:128], r1
-+        vst1.64         {d0, d1},  [r0,:128], r1
-+        vst1.64         {d10,d11}, [r0,:128]
-+
-+        align_pop_regs
-+        bx              lr
-+        .endfunc
-+
-+        .global ff_h264_h_loop_filter_luma_neon
-+        .func   ff_h264_h_loop_filter_luma_neon
-+ff_h264_h_loop_filter_luma_neon:
-+        h264_loop_filter_start
-+
-+        sub             r0,  r0,  #4
-+        vld1.64         {d6},  [r0], r1
-+        vld1.64         {d20}, [r0], r1
-+        vld1.64         {d18}, [r0], r1
-+        vld1.64         {d16}, [r0], r1
-+        vld1.64         {d0},  [r0], r1
-+        vld1.64         {d2},  [r0], r1
-+        vld1.64         {d4},  [r0], r1
-+        vld1.64         {d26}, [r0], r1
-+        vld1.64         {d7},  [r0], r1
-+        vld1.64         {d21}, [r0], r1
-+        vld1.64         {d19}, [r0], r1
-+        vld1.64         {d17}, [r0], r1
-+        vld1.64         {d1},  [r0], r1
-+        vld1.64         {d3},  [r0], r1
-+        vld1.64         {d5},  [r0], r1
-+        vld1.64         {d27}, [r0], r1
-+
-+        vtrn.32         q3,  q0
-+        vtrn.32         q10, q1
-+        vtrn.32         q9,  q2
-+        vtrn.32         q8,  q13
-+        vtrn.16         q3,  q9
-+        vtrn.16         q10, q8
-+        vtrn.16         q0,  q2
-+        vtrn.16         q1,  q13
-+        vtrn.8          q3,  q10
-+        vtrn.8          q9,  q8
-+        vtrn.8          q0,  q1
-+        vtrn.8          q2,  q13
-+
-+        align_push_regs
-+        sub             sp,  sp,  #16
-+        vst1.64         {d4, d5},  [sp,:128]
-+        sub             sp,  sp,  #16
-+        vst1.64         {d20,d21}, [sp,:128]
-+
-+        h264_loop_filter_luma
-+
-+        vld1.64         {d20,d21}, [sp,:128]!
-+        vld1.64         {d4, d5},  [sp,:128]!
-+
-+        vtrn.32         q3,  q0
-+        vtrn.32         q10, q5
-+        vtrn.32         q4,  q2
-+        vtrn.32         q8,  q13
-+        vtrn.16         q3,  q4
-+        vtrn.16         q10, q8
-+        vtrn.16         q0,  q2
-+        vtrn.16         q5,  q13
-+        vtrn.8          q3,  q10
-+        vtrn.8          q4,  q8
-+        vtrn.8          q0,  q5
-+        vtrn.8          q2,  q13
-+
-+        sub             r0,  r0,  r1, lsl #4
-+        vst1.64         {d6},  [r0], r1
-+        vst1.64         {d20}, [r0], r1
-+        vst1.64         {d8},  [r0], r1
-+        vst1.64         {d16}, [r0], r1
-+        vst1.64         {d0},  [r0], r1
-+        vst1.64         {d10}, [r0], r1
-+        vst1.64         {d4},  [r0], r1
-+        vst1.64         {d26}, [r0], r1
-+        vst1.64         {d7},  [r0], r1
-+        vst1.64         {d21}, [r0], r1
-+        vst1.64         {d9},  [r0], r1
-+        vst1.64         {d17}, [r0], r1
-+        vst1.64         {d1},  [r0], r1
-+        vst1.64         {d11}, [r0], r1
-+        vst1.64         {d5},  [r0], r1
-+        vst1.64         {d27}, [r0], r1
-+
-+        align_pop_regs
-+        bx              lr
-+        .endfunc
-+
-+        .macro h264_loop_filter_chroma
-+        vdup.8          d22, r2         @ alpha
-+        vmovl.u8        q12, d24
-+        vabd.u8         d26, d16, d0    @ abs(p0 - q0)
-+        vmovl.u8        q2,  d0
-+        vabd.u8         d28, d18, d16   @ abs(p1 - p0)
-+        vsubw.u8        q2,  q2,  d16
-+        vsli.16         d24, d24, #8
-+        vshl.i16        q2,  q2,  #2
-+        vabd.u8         d30, d2,  d0    @ abs(q1 - q0)
-+        vaddw.u8        q2,  q2,  d18
-+        vclt.u8         d26, d26, d22   @ < alpha
-+        vsubw.u8        q2,  q2,  d2
-+        vdup.8          d22, r3         @ beta
-+        vclt.s8         d25, d24, #0
-+        vrshrn.i16      d4,  q2,  #3
-+        vclt.u8         d28, d28, d22   @ < beta
-+        vbic            d26, d26, d25
-+        vclt.u8         d30, d30, d22   @ < beta
-+        vand            d26, d26, d28
-+        vneg.s8         d25, d24
-+        vand            d26, d26, d30
-+        vmin.s8         d4,  d4,  d24
-+        vmovl.u8        q14, d16
-+        vand            d4,  d4,  d26
-+        vmax.s8         d4,  d4,  d25
-+        vmovl.u8        q11, d0
-+        vaddw.s8        q14, q14, d4
-+        vsubw.s8        q11, q11, d4
-+        vqmovun.s16     d16, q14
-+        vqmovun.s16     d0,  q11
-+        .endm
-+
-+        .global ff_h264_v_loop_filter_chroma_neon
-+        .func   ff_h264_v_loop_filter_chroma_neon
-+ff_h264_v_loop_filter_chroma_neon:
-+        h264_loop_filter_start
-+
-+        sub             r0,  r0,  r1, lsl #1
-+        vld1.64         {d18}, [r0,:64], r1
-+        vld1.64         {d16}, [r0,:64], r1
-+        vld1.64         {d0},  [r0,:64], r1
-+        vld1.64         {d2},  [r0,:64]
-+
-+        h264_loop_filter_chroma
-+
-+        sub             r0,  r0,  r1, lsl #1
-+        vst1.64         {d16}, [r0,:64], r1
-+        vst1.64         {d0},  [r0,:64], r1
-+
-+        bx              lr
-+        .endfunc
-+
-+        .global ff_h264_h_loop_filter_chroma_neon
-+        .func   ff_h264_h_loop_filter_chroma_neon
-+ff_h264_h_loop_filter_chroma_neon:
-+        h264_loop_filter_start
-+
-+        sub             r0,  r0,  #2
-+        vld1.32         {d18[0]}, [r0], r1
-+        vld1.32         {d16[0]}, [r0], r1
-+        vld1.32         {d0[0]},  [r0], r1
-+        vld1.32         {d2[0]},  [r0], r1
-+        vld1.32         {d18[1]}, [r0], r1
-+        vld1.32         {d16[1]}, [r0], r1
-+        vld1.32         {d0[1]},  [r0], r1
-+        vld1.32         {d2[1]},  [r0], r1
-+
-+        vtrn.16         d18, d0
-+        vtrn.16         d16, d2
-+        vtrn.8          d18, d16
-+        vtrn.8          d0,  d2
-+
-+        h264_loop_filter_chroma
-+
-+        vtrn.16         d18, d0
-+        vtrn.16         d16, d2
-+        vtrn.8          d18, d16
-+        vtrn.8          d0,  d2
-+
-+        sub             r0,  r0,  r1, lsl #3
-+        vst1.32         {d18[0]}, [r0], r1
-+        vst1.32         {d16[0]}, [r0], r1
-+        vst1.32         {d0[0]},  [r0], r1
-+        vst1.32         {d2[0]},  [r0], r1
-+        vst1.32         {d18[1]}, [r0], r1
-+        vst1.32         {d16[1]}, [r0], r1
-+        vst1.32         {d0[1]},  [r0], r1
-+        vst1.32         {d2[1]},  [r0], r1
-+
-+        bx              lr
-+        .endfunc
diff --git a/packages/mplayer/files/mru-neon-h264-qpel.diff b/packages/mplayer/files/mru-neon-h264-qpel.diff
deleted file mode 100644
index 6ed479b19b..0000000000
--- a/packages/mplayer/files/mru-neon-h264-qpel.diff
+++ /dev/null
@@ -1,1040 +0,0 @@
-From: Mans Rullgard <mans@mansr.com>
-Date: Sat, 23 Aug 2008 00:24:04 +0000 (+0100)
-Subject: ARM: NEON optimised H.264 8x8 and 16x16 qpel MC
-X-Git-Url: http://git.mansr.com/?p=ffmpeg.mru;a=commitdiff_plain;h=55661fd933572f67248c0730f6c75a6db0f0eb6a
-
-ARM: NEON optimised H.264 8x8 and 16x16 qpel MC
----
-
-diff --git a/libavcodec/armv4l/dsputil_neon.c b/libavcodec/armv4l/dsputil_neon.c
-index 68ecbe8..a932aa9 100644
---- a/libavcodec/armv4l/dsputil_neon.c
-+++ b/libavcodec/armv4l/dsputil_neon.c
-@@ -40,7 +40,38 @@ void ff_put_pixels8_y2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
- void ff_put_pixels8_xy2_no_rnd_neon(uint8_t *, const uint8_t *, int, int);
- 
- void ff_put_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, int);
-+void ff_put_h264_qpel16_mc10_neon(uint8_t *, uint8_t *, int);
-+void ff_put_h264_qpel16_mc20_neon(uint8_t *, uint8_t *, int);
-+void ff_put_h264_qpel16_mc30_neon(uint8_t *, uint8_t *, int);
-+void ff_put_h264_qpel16_mc01_neon(uint8_t *, uint8_t *, int);
-+void ff_put_h264_qpel16_mc11_neon(uint8_t *, uint8_t *, int);
-+void ff_put_h264_qpel16_mc21_neon(uint8_t *, uint8_t *, int);
-+void ff_p