From c1671f37b1a6b8872d736bfdcee25770dbbd5a06 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 3 Oct 2012 19:24:58 +0100 Subject: reduce talloc usage to box tree layout only --- image/video.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'image/video.c') diff --git a/image/video.c b/image/video.c index 2255208c3..1cbbeebf0 100644 --- a/image/video.c +++ b/image/video.c @@ -21,7 +21,6 @@ #include "content/content_factory.h" #include "content/content_protected.h" #include "image/video.h" -#include "utils/talloc.h" typedef struct nsvideo_content { struct content base; @@ -76,26 +75,26 @@ static nserror nsvideo_create(const content_handler *handler, nserror error; GstBus *bus; - video = talloc_zero(0, nsvideo_content); + video = calloc(1, sizeof(nsvideo_content)); if (video == NULL) return NSERROR_NOMEM; error = content__init(&video->base, handler, imime_type, params, llcache, fallback_charset, quirks); if (error != NSERROR_OK) { - talloc_free(video); + free(video); return error; } error = llcache_handle_force_stream(llcache); if (error != NSERROR_OK) { - talloc_free(video); + free(video); return error; } video->playbin = gst_element_factory_make("playbin2", NULL); if (video->playbin == NULL) { - talloc_free(video); + free(video); return NSERROR_NOMEM; } -- cgit v1.2.3