summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-07-03 20:04:21 +0300
committerUoti Urpala <uau@mplayer2.org>2011-07-03 20:04:21 +0300
commitc5364305bec6dff4566b988157b93d3d171465e3 (patch)
tree13e28a781e2e1f4699b4caffff0d61e2ef079187 /libmpdemux/demuxer.c
parent774bb252aa0bda6a6ef927cd9287b0a6c01da0e6 (diff)
downloadmpv-c5364305bec6dff4566b988157b93d3d171465e3.tar.bz2
mpv-c5364305bec6dff4566b988157b93d3d171465e3.tar.xz
commands: change property mechanism to use talloc strings
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index d7fed469f9..b504ad4893 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -1468,18 +1468,16 @@ char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter)
{
char *chapter_name = demuxer_chapter_name(demuxer, chapter);
if (chapter_name) {
- char *tmp = malloc(strlen(chapter_name) + 14);
- snprintf(tmp, 63, "(%d) %s", chapter + 1, chapter_name);
+ char *tmp = talloc_asprintf(NULL, "(%d) %s", chapter + 1, chapter_name);
free(chapter_name);
return tmp;
} else {
int chapter_num = demuxer_chapter_count(demuxer);
- char tmp[30];
if (chapter_num <= 0)
- sprintf(tmp, "(%d)", chapter + 1);
+ return talloc_asprintf(NULL, "(%d)", chapter + 1);
else
- sprintf(tmp, "(%d) of %d", chapter + 1, chapter_num);
- return strdup(tmp);
+ return talloc_asprintf(NULL, "(%d) of %d", chapter + 1,
+ chapter_num);
}
}