mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source 
Conflicts:
	ext/libswscale/gstffmpegscale.c
This commit is contained in:
Wim Taymans 2012-04-19 14:49:18 +02:00
commit 8fee156175
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/libswscale/gstffmpegscale.c
View file

@ -550,7 +550,9 @@ gst_ffmpegscale_set_caps (GstBaseTransform * trans, GstCaps * incaps,
GstCaps * outcaps) GstCaps * outcaps)
{ {
GstFFMpegScale *scale = GST_FFMPEGSCALE (trans); GstFFMpegScale *scale = GST_FFMPEGSCALE (trans);
#ifdef HAVE_ORC
guint mmx_flags, altivec_flags; guint mmx_flags, altivec_flags;
#endif
gint swsflags; gint swsflags;
gboolean ok; 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) | (mmx_flags & ORC_TARGET_MMX_3DNOW ? SWS_CPU_CAPS_3DNOW : 0)
| (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0); | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0);
#else #else
mmx_flags = 0;
altivec_flags = 0;
swsflags = 0; swsflags = 0;
#endif #endif