Merge from 1.2 main.

3 files changed, 8 insertions, 34 deletions

diff --git a/src/libreal/real_common.c b/src/libreal/real_common.c
index fcd0fac8f..531fb780e 100644
--- a/src/libreal/real_common.c
+++ b/src/libreal/real_common.c
@@ -184,7 +184,7 @@ void *_x_real_codec_open(xine_stream_t *const stream, const char *const path,
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec },
-  { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "realadec", XINE_VERSION_CODE, &dec_info_realaudio, init_realadec },
+  { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "realvdec", XINE_VERSION_CODE, &dec_info_realvideo, init_realvdec },
+  { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "realadec", XINE_VERSION_CODE, &dec_info_realaudio, init_realadec },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c
index 1b21de2d0..5c43f8480 100644
--- a/src/libreal/xine_real_audio_decoder.c
+++ b/src/libreal/xine_real_audio_decoder.c
@@ -582,19 +582,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
 /*
  * real plugin class
  */
-
-static char *get_identifier (audio_decoder_class_t *this) {
-  return "realadec";
-}
-
-static char *get_description (audio_decoder_class_t *this) {
-  return "real binary-only codec based audio decoder plugin";
-}
-
-static void dispose_class (audio_decoder_class_t *this) {
-  free (this);
-}
-
 void *init_realadec (xine_t *xine, void *data) {
 
   real_class_t       *this;
@@ -603,9 +590,9 @@ void *init_realadec (xine_t *xine, void *data) {
   this = (real_class_t *) xine_xmalloc (sizeof (real_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      = "realadec";
+  this->decoder_class.description     = N_("real binary-only codec based audio decoder plugin");
+  this->decoder_class.dispose         = default_audio_decoder_class_dispose;
 
   _x_real_codecs_init(xine);
 
diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c
index d68c7390e..617c9f6b5 100644
--- a/src/libreal/xine_real_video_decoder.c
+++ b/src/libreal/xine_real_video_decoder.c
@@ -510,19 +510,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
 /*
  * real plugin class
  */
-
-static char *get_identifier (video_decoder_class_t *this) {
-  return "realvdec";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "real binary-only codec based video decoder plugin";
-}
-
-static void dispose_class (video_decoder_class_t *this) {
-  free (this);
-}
-
 void *init_realvdec (xine_t *xine, void *data) {
 
   real_class_t       *this;
@@ -531,9 +518,9 @@ void *init_realvdec (xine_t *xine, void *data) {
   this = (real_class_t *) xine_xmalloc (sizeof (real_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      = "realvdec";
+  this->decoder_class.description     = N_("real binary-only codec based video decoder plugin");
+  this->decoder_class.dispose         = default_video_decoder_class_dispose;
 
   _x_real_codecs_init(xine);