From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Thu, 19 Apr 2012 12:49:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Tag: RELEASE-0.11.91~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fee1561757f5f940805378e9bb3744d079b0f03;p=platform%2Fupstream%2Fgst-libav.git

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	ext/libswscale/gstffmpegscale.c
---

8fee1561757f5f940805378e9bb3744d079b0f03
diff --cc ext/libswscale/gstffmpegscale.c
index 01c4256,c7a7087..63ffe14
--- a/ext/libswscale/gstffmpegscale.c
+++ b/ext/libswscale/gstffmpegscale.c
@@@ -550,8 -594,11 +550,10 @@@ gst_ffmpegscale_set_caps (GstBaseTransf
      GstCaps * outcaps)
  {
    GstFFMpegScale *scale = GST_FFMPEGSCALE (trans);
+ #ifdef HAVE_ORC
    guint mmx_flags, altivec_flags;
+ #endif
    gint swsflags;
 -  GstVideoFormat in_format, out_format;
    gboolean ok;
  
    g_return_val_if_fail (scale->method <