Merge remote-tracking branch 'origin/0.10'

Conflicts:
	ext/libswscale/gstffmpegscale.c

diff --cc ext/libswscale/gstffmpegscale.c
index 01c4256,c7a7087..63ffe14
--- 1/ext/libswscale/gstffmpegscale.c
--- 2/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 <