diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 14:44:39 +0300 |
| commit | 4467de60c581f2a5f7ae737c30ab63be0e3f6e25 (patch) | |
| tree | 37d2893e34f613a65383f9288d0af3b985fcd85f /src/input/input_cdda.c | |
| parent | 81c84b6bf06482c5988fd16f68050177c1afc358 (diff) | |
| parent | 9f105cfe9059df4a9a1f5278679151a5d9c387f6 (diff) | |
| download | xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.gz xine-lib-4467de60c581f2a5f7ae737c30ab63be0e3f6e25.tar.bz2 | |
Merge from 1.1
Diffstat (limited to 'src/input/input_cdda.c')
| -rw-r--r-- | src/input/input_cdda.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 61528fea5..824b97fbb 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -1485,7 +1485,7 @@ static void _cdda_parse_cddb_info (cdda_input_plugin_t *this, char *buffer, char int nyear; char *y = strstr (buffer, "YEAR:"); if (y && sscanf (y + 5, "%4d", &nyear) == 1) - asprintf (&this->cddb.disc_year, "%d", nyear); + this->cddb.disc_year = _x_asprintf ("%d", nyear); } } } @@ -2510,7 +2510,7 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, if (num_tracks >= MAX_TRACKS-1) num_tracks = MAX_TRACKS - 2; for ( i = 0; i <= num_tracks; i++ ) - asprintf(&this->autoplaylist[i],"cdda:/%d",i+toc->first_track); + this->autoplaylist[i] = _x_asprintf("cdda:/%d",i+toc->first_track); *num_files = toc->last_track - toc->first_track + 1; |