summaryrefslogtreecommitdiff
path: root/src/xine-engine/info_helper.c
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
commit4527fd438b39dc312c69839f051e0a2ac0046356 (patch)
treed3b2dc1f89617e86c619575e3324534c523ed673 /src/xine-engine/info_helper.c
parent47c1651eb8c42ab6dddaff7c0663c45ac49b4fcf (diff)
parent88d23a2dbabf419ab4014b449be119a741aa54f5 (diff)
downloadxine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.gz
xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.bz2
Merge file removal.
Diffstat (limited to 'src/xine-engine/info_helper.c')
-rw-r--r--src/xine-engine/info_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index 1ac4ed982..2d0ff4d8d 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -340,7 +340,7 @@ void _x_meta_info_set_utf8(xine_stream_t *stream, int info, const char *str) {
void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int len) {
pthread_mutex_lock(&stream->meta_mutex);
if(meta_valid(info) && len) {
- char *str = xine_xmalloc(len + 1);
+ char *str = malloc(len + 1);
snprintf(str, len + 1 , "%s", buf);
meta_info_set_unlocked(stream, info, (const char *) &str[0]);
@@ -376,7 +376,7 @@ void _x_meta_info_set_multi(xine_stream_t *stream, int info, ...) {
if(len) {
char *p, *meta;
- p = meta = (char *) xine_xmalloc(len + 1);
+ p = meta = (char *) malloc(len + 1);
n = 0;
while(args[n]) {