summaryrefslogtreecommitdiff
path: root/src/input/input_vcd.c
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2011-10-17 14:44:39 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2011-10-17 14:44:39 +0300
commit4467de60c581f2a5f7ae737c30ab63be0e3f6e25 (patch)
tree37d2893e34f613a65383f9288d0af3b985fcd85f /src/input/input_vcd.c
parent81c84b6bf06482c5988fd16f68050177c1afc358 (diff)
parent9f105cfe9059df4a9a1f5278679151a5d9c387f6 (diff)
downloadxine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.gz
xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.bz2
Merge from 1.1
Diffstat (limited to 'src/input/input_vcd.c')
-rw-r--r--src/input/input_vcd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 14b86a4c0..b15130500 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -1000,8 +1000,7 @@ static xine_mrl_t **vcd_class_get_dir (input_class_t *this_gen, const char *file
memset(this->mrls[(i-1)], 0, sizeof(xine_mrl_t));
}
- asprintf(&(this->mrls[i-1]->mrl), "vcdo:/%d", i);
-
+ this->mrls[i-1]->mrl = _x_asprintf("vcdo:/%d", i);
this->mrls[i-1]->type = mrl_vcd;
/* hack */
@@ -1055,7 +1054,7 @@ static char ** vcd_class_get_autoplay_list (input_class_t *this_gen, int *num_fi
/* FIXME: check if track 0 contains valid data */
for (i = 1; i < this->total_tracks; i++)
- asprintf(&this->filelist[i-1], "vcdo:/%d", i);
+ this->filelist[i-1] = _x_asprintf("vcdo:/%d", i);
/* printf ("%d tracks\n", this->total_tracks); */