mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-19 08:11:16 +00:00
Merge remote-tracking branch 'origin/0.10'
This commit is contained in:
commit
2e3dd525c8
1 changed files with 2 additions and 2 deletions
|
@ -279,8 +279,10 @@ gst_ffmpeg_log_callback (void *ptr, int level, const char *fmt, va_list vl)
|
||||||
static void
|
static void
|
||||||
change_context (GstPostProc * postproc, gint width, gint height)
|
change_context (GstPostProc * postproc, gint width, gint height)
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_ORC
|
||||||
guint mmx_flags;
|
guint mmx_flags;
|
||||||
guint altivec_flags;
|
guint altivec_flags;
|
||||||
|
#endif
|
||||||
gint ppflags;
|
gint ppflags;
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (postproc, "change_context, width:%d, height:%d",
|
GST_DEBUG_OBJECT (postproc, "change_context, width:%d, height:%d",
|
||||||
|
@ -300,8 +302,6 @@ change_context (GstPostProc * postproc, gint width, gint height)
|
||||||
| (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
|
| (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC :
|
||||||
0);
|
0);
|
||||||
#else
|
#else
|
||||||
mmx_flags = 0;
|
|
||||||
altivec_flags = 0;
|
|
||||||
ppflags = 0;
|
ppflags = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue