summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2003-03-16 22:28:14 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2003-03-16 22:28:14 +0000
commitc11aa39f7c9879842bd12a6c9a56cec047b5bfbd (patch)
tree3a649e6bbd9042b8a1e9e49dfc0c3a898d9ae2a6
parentadb29283e51b34c10e53dbc70e4ed063dc9737bd (diff)
downloadxine-lib-c11aa39f7c9879842bd12a6c9a56cec047b5bfbd.tar.gz
xine-lib-c11aa39f7c9879842bd12a6c9a56cec047b5bfbd.tar.bz2
fix segfault when no vidix driver is found
CVS patchset: 4433 CVS date: 2003/03/16 22:28:14
-rw-r--r--src/video_out/video_out_vidix.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index f0ae61359..37e1f20b9 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.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_vidix.c,v 1.34 2003/03/14 19:46:52 jstembridge Exp $
+ * $Id: video_out_vidix.c,v 1.35 2003/03/16 22:28:14 jstembridge Exp $
*
* video_out_vidix.c
*
@@ -1103,10 +1103,12 @@ static void *vidix_init_class (xine_t *xine, void *visual_gen) {
vidix_class_t *this = init_class (xine, visual_gen);
- this->driver_class.open_plugin = vidix_open_plugin;
- this->driver_class.get_identifier = vidix_get_identifier;
- this->driver_class.get_description = vidix_get_description;
- this->driver_class.dispose = dispose_class;
+ if(this) {
+ this->driver_class.open_plugin = vidix_open_plugin;
+ this->driver_class.get_identifier = vidix_get_identifier;
+ this->driver_class.get_description = vidix_get_description;
+ this->driver_class.dispose = dispose_class;
+ }
return this;
}
@@ -1176,10 +1178,12 @@ static void *vidixfb_init_class (xine_t *xine, void *visual_gen) {
vidix_class_t *this = init_class (xine, visual_gen);
- this->driver_class.open_plugin = vidixfb_open_plugin;
- this->driver_class.get_identifier = vidixfb_get_identifier;
- this->driver_class.get_description = vidixfb_get_description;
- this->driver_class.dispose = dispose_class;
+ if(this) {
+ this->driver_class.open_plugin = vidixfb_open_plugin;
+ this->driver_class.get_identifier = vidixfb_get_identifier;
+ this->driver_class.get_description = vidixfb_get_description;
+ this->driver_class.dispose = dispose_class;
+ }
return this;
}