diff -Nru gstreamer0.10-ffmpeg-0.10.12/debian/changelog gstreamer0.10-ffmpeg-0.10.12/debian/changelog
--- gstreamer0.10-ffmpeg-0.10.12/debian/changelog	2011-10-12 13:31:58.000000000 +0000
+++ gstreamer0.10-ffmpeg-0.10.12/debian/changelog	2011-10-17 09:30:22.000000000 +0000
@@ -1,3 +1,10 @@
+gstreamer0.10-ffmpeg (0.10.12-1ubuntu1+ti2) oneiric; urgency=low
+
+  * Added to patch to support non-VP8 codec
+  * Restricted architecture to armel
+
+ -- Olivier Naudan <o-naudan@ti.com>  Mon, 17 Oct 2011 05:29:58 -0400
+
 gstreamer0.10-ffmpeg (0.10.12-1ubuntu1+ti1) oneiric; urgency=low
 
   * Rebased TI patches on release 0.10.12. Only three remaining
diff -Nru gstreamer0.10-ffmpeg-0.10.12/debian/control gstreamer0.10-ffmpeg-0.10.12/debian/control
--- gstreamer0.10-ffmpeg-0.10.12/debian/control	2011-10-12 13:31:58.000000000 +0000
+++ gstreamer0.10-ffmpeg-0.10.12/debian/control	2011-10-17 09:24:20.000000000 +0000
@@ -26,7 +26,7 @@
 Standards-Version: 3.8.4
 
 Package: gstreamer0.10-ffmpeg
-Architecture: any
+Architecture: armel
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -49,7 +49,7 @@
  http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html
 
 Package: gstreamer0.10-ffmpeg-dbg
-Architecture: any
+Architecture: armel
 Section: debug
 Priority: extra
 Depends: ${misc:Depends},
diff -Nru gstreamer0.10-ffmpeg-0.10.12/debian/patches/0004-ffdec-fallback-to-memalloc-if-clipping-is-needed-for.patch gstreamer0.10-ffmpeg-0.10.12/debian/patches/0004-ffdec-fallback-to-memalloc-if-clipping-is-needed-for.patch
--- gstreamer0.10-ffmpeg-0.10.12/debian/patches/0004-ffdec-fallback-to-memalloc-if-clipping-is-needed-for.patch	1970-01-01 00:00:00.000000000 +0000
+++ gstreamer0.10-ffmpeg-0.10.12/debian/patches/0004-ffdec-fallback-to-memalloc-if-clipping-is-needed-for.patch	2011-10-17 09:27:05.000000000 +0000
@@ -0,0 +1,47 @@
+From 768b42c811faa3434f9772b7b048706745bca5ea Mon Sep 17 00:00:00 2001
+From: Alessandro Decina <alessandro.decina@collabora.co.uk>
+Date: Thu, 6 Oct 2011 16:27:23 +0200
+Subject: [PATCH] ffdec: fallback to memalloc if clipping is needed for codecs
+ != VP8
+
+Fixes crashes with weird resolutions where clipping is applied.
+---
+ ext/ffmpeg/gstffmpegdec.c |   22 ++++++++++++++++------
+ 1 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
+index 33fd82b..bc25518 100644
+--- a/ext/ffmpeg/gstffmpegdec.c
++++ b/ext/ffmpeg/gstffmpegdec.c
+@@ -1047,12 +1047,22 @@ gst_ffmpegdec_get_buffer (AVCodecContext * context, AVFrame * picture)
+           width, height, clip_width, clip_height);
+ 
+       if (width != clip_width || height != clip_height) {
+-        /* we can clip.. although we should somehow keep track of the
+-         * clipped size so we can send the correct vstab event to the
+-         * video sink..
+-         */
+-        width = clip_width;
+-        height = clip_height;
++        GST_DEBUG_OBJECT (ffmpegdec, "clipping from %dx%d to %dx%d",
++            width, height, clip_width, clip_height);
++        if (ffmpegdec->use_border) {
++          /* we can clip.. although we should somehow keep track of the
++           * clipped size so we can send the correct vstab event to the
++           * video sink..
++           *
++           * NOTE: this assumes that clip_width >= width && clip_height >= height
++           */
++          width = clip_width;
++          height = clip_height;
++        } else {
++          /* We can't alloc if we need to clip the output buffer later */
++          GST_LOG_OBJECT (ffmpegdec, "we need clipping, fallback alloc");
++          return avcodec_default_get_buffer (context, picture);
++        }
+       }
+ 
+       /* alloc with aligned dimensions for ffmpeg */
+-- 
+1.7.5.4
+
diff -Nru gstreamer0.10-ffmpeg-0.10.12/debian/patches/series gstreamer0.10-ffmpeg-0.10.12/debian/patches/series
--- gstreamer0.10-ffmpeg-0.10.12/debian/patches/series	2011-10-12 13:31:58.000000000 +0000
+++ gstreamer0.10-ffmpeg-0.10.12/debian/patches/series	2011-10-17 09:28:39.000000000 +0000
@@ -2,5 +2,6 @@
 0001-ffdec-zero-copy-support-for-edges.patch
 0002-gstffmpegdec-Decrease-rank-of-decoders.patch
 0003-Revert-ffmpegdec-Set-default-number-of-threads-to-1.patch
+0004-ffdec-fallback-to-memalloc-if-clipping-is-needed-for.patch
 02_plugin-dependencies.patch
 99_ltmain_as-needed.patch