Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / gst / effectv / gstwarp.c

diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 72a45c0..80161a7 100644 (file)
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -54,7 +54,7 @@
 #include <math.h>
 
 #include "gstwarp.h"
-#include <gst/video/gstmetavideo.h>
+#include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
 
 #ifndef M_PI
@@ -133,11 +133,7 @@ initDistTable (GstWarpTV * filter, gint width, gint height)
 {
   gint32 halfw, halfh, *distptr;
   gint x, y;
-#ifdef PS2
-  float m;
-#else
   float m;
-#endif
 
   halfw = width >> 1;
   halfh = height >> 1;
@@ -256,7 +252,7 @@ gst_wraptv_decide_allocation (GstBaseTransform * trans, GstQuery * query)
 
     config = gst_buffer_pool_get_config (pool);
     gst_buffer_pool_config_add_option (config,
-        GST_BUFFER_POOL_OPTION_META_VIDEO);
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
     gst_buffer_pool_set_config (pool, config);
   }
   return TRUE;
@@ -304,6 +300,5 @@ gst_warptv_class_init (GstWarpTVClass * klass)
 static void
 gst_warptv_init (GstWarpTV * warptv)
 {
-  gst_pad_use_fixed_caps (GST_BASE_TRANSFORM_SRC_PAD (warptv));
-  gst_pad_use_fixed_caps (GST_BASE_TRANSFORM_SINK_PAD (warptv));
+  /* nothing to do */
 }