diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-04-19 14:49:18 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-04-19 14:49:18 +0200 |
| commit | 8fee1561757f5f940805378e9bb3744d079b0f03 (patch) | |
| tree | 2dd12e8bacb11b2ddad07cdf8040aa41128a674b | |
| parent | 5c9d454517dcab7e4c168ee804afb4768ac82f42 (diff) | |
| parent | b053a50508d30e8bad5a6bed39ee7f264527f404 (diff) | |
| download | gst-libav-8fee1561757f5f940805378e9bb3744d079b0f03.tar.gz | |
Merge remote-tracking branch 'origin/0.10'
Conflicts:
ext/libswscale/gstffmpegscale.c
| -rw-r--r-- | ext/libswscale/gstffmpegscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c index 01c4256..63ffe14 100644 --- a/ext/libswscale/gstffmpegscale.c +++ b/ext/libswscale/gstffmpegscale.c @@ -550,7 +550,9 @@ gst_ffmpegscale_set_caps (GstBaseTransform * trans, GstCaps * incaps, GstCaps * outcaps) { GstFFMpegScale *scale = GST_FFMPEGSCALE (trans); +#ifdef HAVE_ORC guint mmx_flags, altivec_flags; +#endif gint swsflags; gboolean ok; @@ -591,8 +593,6 @@ gst_ffmpegscale_set_caps (GstBaseTransform * trans, GstCaps * incaps, | (mmx_flags & ORC_TARGET_MMX_3DNOW ? SWS_CPU_CAPS_3DNOW : 0) | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0); #else - mmx_flags = 0; - altivec_flags = 0; swsflags = 0; #endif |