summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-07-03 14:48:00 +0300
committerUoti Urpala <uau@mplayer2.org>2011-07-03 15:01:24 +0300
commit1a8384401b8df76b07be93f8994fbfee152a20ad (patch)
treebed1c9937e8b0b8d14506cef05836cc7e16aeb90 /libmpdemux/demux_mkv.c
parenteb614560656994989e8175adb84e2a315c809ff5 (diff)
downloadmpv-1a8384401b8df76b07be93f8994fbfee152a20ad.tar.bz2
mpv-1a8384401b8df76b07be93f8994fbfee152a20ad.tar.xz
demux: use talloc for sh_* structs and "lang" field
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index ba0eaf4800..7d84fa5f63 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1289,7 +1289,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track,
return 1;
if (track->language && (strcmp(track->language, "und") != 0))
- sh_a->lang = strdup(track->language);
+ sh_a->lang = talloc_strdup(sh_a, track->language);
sh_a->default_track = track->default_track;
sh_a->ds = demuxer->audio;
sh_a->wf = malloc(sizeof(*sh_a->wf));
@@ -1587,7 +1587,7 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track,
memcpy(sh->extradata, track->private_data, track->private_size);
sh->extradata_len = track->private_size;
if (track->language && (strcmp(track->language, "und") != 0))
- sh->lang = strdup(track->language);
+ sh->lang = talloc_strdup(sh, track->language);
sh->default_track = track->default_track;
} else {
mp_tmsg(MSGT_DEMUX, MSGL_ERR,