mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 13:55:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffscale: fix compilation when ORC is missing

Browse source 
Fix set but not used compiler error when ORC is missing.
This commit is contained in:
Wim Taymans 2012-04-19 14:45:42 +02:00
parent d417f99cd7
commit b053a50508
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/libswscale/gstffmpegscale.c
View file

@ -594,7 +594,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;
GstVideoFormat in_format, out_format; GstVideoFormat in_format, out_format;
gboolean ok; gboolean ok;
@ -638,12 +640,9 @@ 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
scale->ctx = sws_getContext (scale->in_width, scale->in_height, scale->ctx = sws_getContext (scale->in_width, scale->in_height,
scale->in_pixfmt, scale->out_width, scale->out_height, scale->out_pixfmt, scale->in_pixfmt, scale->out_width, scale->out_height, scale->out_pixfmt,
swsflags | gst_ffmpegscale_method_flags[scale->method], NULL, NULL, NULL); swsflags | gst_ffmpegscale_method_flags[scale->method], NULL, NULL, NULL);
@ -817,9 +816,7 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"ffvideoscale", "ffvideoscale",
"videoscaling element (" FFMPEG_SOURCE ")", "videoscaling element (" FFMPEG_SOURCE ")", plugin_init, PACKAGE_VERSION,
plugin_init,
PACKAGE_VERSION,
#ifdef GST_FFMPEG_ENABLE_LGPL #ifdef GST_FFMPEG_ENABLE_LGPL
"LGPL", "LGPL",
#else #else