diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/video_out_xv.c | 16 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 8 |
2 files changed, 15 insertions, 9 deletions
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index b32908e16..ef32ae18e 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xv.c,v 1.6 2001/04/28 19:47:42 guenter Exp $ + * $Id: video_out_xv.c,v 1.7 2001/04/28 22:03:03 guenter Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -687,6 +687,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual) { XineramaScreenInfo *screeninfo = NULL; #endif + display = (Display *) visual; xine_debug = config->lookup_int (config, "xine_debug", 0); @@ -733,12 +734,17 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual) { } else printf ("video_out_xv: using Xv port %d for hardware colorspace conversion and scaling.\n", xv_port); - /* * from this point on, nothing should go wrong anymore; so let's start initializing this driver */ this = malloc (sizeof (xv_driver_t)); + + if (!this) { + printf ("video_out_xv: malloc failed\n"); + return NULL; + } + memset (this, 0, sizeof(xv_driver_t)); this->display = display; @@ -823,9 +829,8 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual) { xv_check_capability (this, VO_CAP_COLORKEY, VO_PROP_COLORKEY, attr[k], adaptor_info[i].base_id, "XV_COLORKEY"); } - - XFree(attr); } + XFree(attr); } else { printf("video_out_xv: no port attributes defined.\n"); } @@ -911,9 +916,10 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual) { * init window */ + /* xv_calc_format (this, 720, 576, 2); xv_setup_window (this); - + */ return &this->vo_driver; } diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index bf40d3115..124c377b8 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.13 2001/04/28 21:23:04 guenter Exp $ + * $Id: load_plugins.c,v 1.14 2001/04/28 22:03:03 guenter Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -178,7 +178,7 @@ void load_input_plugins (xine_t *this, this->num_input_plugins++; } else { - printf ("load_plugins: %s is no valid input plugin (lacks init_input_plugin() function)\n"); + printf ("load_plugins: %s is no valid input plugin (lacks init_input_plugin() function)\n", str); } if(this->num_input_plugins > INPUT_PLUGIN_MAX) { @@ -429,14 +429,14 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config, str, dlerror()); return NULL; } else { - void *(*initplug) (config_values_t *, void *); - vo_info_t* (*getinfo) (); + vo_info_t* (*getinfo) (void); vo_info_t *vo_info; if ((getinfo = dlsym(plugin, "get_video_out_plugin_info")) != NULL) { vo_info = getinfo(); if (!strcmp(id, vo_info->id)) { + void *(*initplug) (config_values_t *, void *); if((initplug = dlsym(plugin, "init_video_out_plugin")) != NULL) { |