summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
diff options
context:
space:
mode:
authorSebastian Dransfeld <sd@tango.flipp.net>2008-10-27 09:50:00 +0000
committerSebastian Dransfeld <sd@tango.flipp.net>2008-10-27 09:50:00 +0000
commit65e204a52e17417e83f4676a653f49513337e061 (patch)
tree36c533a5ce322c48c97ac67cb663eecee49a92a3 /legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
parentc42322aebfe91ba2c9b303b2d08ba33dce1dfb44 (diff)
xine_xmalloc is deprecated and gives no benefit for us.
SVN revision: 37218
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine_vo_out.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
index 439ae92509..7e3c66b4c4 100644
--- a/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
+++ b/legacy/emotion/src/modules/xine/emotion_xine_vo_out.c
@@ -116,7 +116,7 @@ _emotion_class_init(xine_t *xine, void *visual)
116 Emotion_Class *cl; 116 Emotion_Class *cl;
117 117
118// printf("emotion: _emotion_class_init()\n"); 118// printf("emotion: _emotion_class_init()\n");
119 cl = (Emotion_Class *) xine_xmalloc(sizeof(Emotion_Class)); 119 cl = (Emotion_Class *) malloc(sizeof(Emotion_Class));
120 if (!cl) return NULL; 120 if (!cl) return NULL;
121 cl->driver_class.open_plugin = _emotion_open; 121 cl->driver_class.open_plugin = _emotion_open;
122 cl->driver_class.get_identifier = _emotion_class_identifier_get; 122 cl->driver_class.get_identifier = _emotion_class_identifier_get;
@@ -165,7 +165,7 @@ _emotion_open(video_driver_class_t *driver_class, const void *visual)
165 cl = (Emotion_Class *)driver_class; 165 cl = (Emotion_Class *)driver_class;
166 /* visual here is the data ptr passed to xine_open_video_driver() */ 166 /* visual here is the data ptr passed to xine_open_video_driver() */
167// printf("emotion: _emotion_open()\n"); 167// printf("emotion: _emotion_open()\n");
168 dv = (Emotion_Driver *)xine_xmalloc(sizeof(Emotion_Driver)); 168 dv = (Emotion_Driver *)malloc(sizeof(Emotion_Driver));
169 if (!dv) return NULL; 169 if (!dv) return NULL;
170 170
171 dv->config = cl->config; 171 dv->config = cl->config;
@@ -311,7 +311,7 @@ _emotion_frame_alloc(vo_driver_t *vo_driver)
311 311
312 dv = (Emotion_Driver *)vo_driver; 312 dv = (Emotion_Driver *)vo_driver;
313// printf("emotion: _emotion_frame_alloc()\n"); 313// printf("emotion: _emotion_frame_alloc()\n");
314 fr = (Emotion_Frame *)xine_xmalloc(sizeof(Emotion_Frame)); 314 fr = (Emotion_Frame *)malloc(sizeof(Emotion_Frame));
315 if (!fr) return NULL; 315 if (!fr) return NULL;
316 316
317 fr->vo_frame.base[0] = NULL; 317 fr->vo_frame.base[0] = NULL;