Merge from 1.2 main.

1 files changed, 4 insertions, 16 deletions

diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index a3b18d060..c8400f464 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -1520,26 +1520,14 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
   return &this->video_decoder;
 }
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "bitplane";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "Raw bitplane video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this) {
-  free (this);
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
 
   bitplane_class_t *this                = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_class_t));
 
   this->decoder_class.open_plugin       = open_plugin;
-  this->decoder_class.get_identifier    = get_identifier;
-  this->decoder_class.get_description   = get_description;
-  this->decoder_class.dispose           = dispose_class;
+  this->decoder_class.identifier        = "bitplane";
+  this->decoder_class.description       = N_("Raw bitplane video decoder plugin");
+  this->decoder_class.dispose           = default_video_decoder_class_dispose;
 
   return this;
 }
@@ -1561,6 +1549,6 @@ static const decoder_info_t dec_info_video = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_VIDEO_DECODER, 18, "bitplane", XINE_VERSION_CODE, &dec_info_video, init_plugin },
+  { PLUGIN_VIDEO_DECODER, 19, "bitplane", XINE_VERSION_CODE, &dec_info_video, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };