Merge from 1.2 main.

1 files changed, 2 insertions, 14 deletions

diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index 99bd597f6..6b6f99be6 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -268,8 +268,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static char          *deinterlace_get_identifier(post_class_t *class_gen);
-static char          *deinterlace_get_description(post_class_t *class_gen);
 static void           deinterlace_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
@@ -299,8 +297,8 @@ static void *deinterlace_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->class.open_plugin     = deinterlace_open_plugin;
-  class->class.get_identifier  = deinterlace_get_identifier;
-  class->class.get_description = deinterlace_get_description;
+  class->class.identifier      = "tvtime";
+  class->class.description     = N_("advanced deinterlacer plugin with pulldown detection");
   class->class.dispose         = deinterlace_class_dispose;
 
 
@@ -412,16 +410,6 @@ static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int input
   return &this->post;
 }
 
-static char *deinterlace_get_identifier(post_class_t *class_gen)
-{
-  return "tvtime";
-}
-
-static char *deinterlace_get_description(post_class_t *class_gen)
-{
-  return "advanced deinterlacer plugin with pulldown detection";
-}
-
 static void deinterlace_class_dispose(post_class_t *class_gen)
 {
   xine_buffer_free(help_string);