summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ogg.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_ogg.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_ogg.c')
-rw-r--r--libmpdemux/demux_ogg.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index 18da80f72a..61828fd9d7 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -27,6 +27,7 @@
#include "options.h"
#include "mp_msg.h"
+#include "talloc.h"
#include "stream/stream.h"
#include "demuxer.h"
#include "stheader.h"
@@ -433,10 +434,10 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os,
free(ogg_d->text_langs[index]);
ogg_d->text_langs[index] = strdup(val);
sh = d->s_streams[index];
- if (sh)
- free(sh->lang);
- if (sh)
- sh->lang = strdup(val);
+ if (sh) {
+ talloc_free(sh->lang);
+ sh->lang = talloc_strdup(sh, val);
+ }
}
// check for -slang if subs are uninitialized yet
if (os->text && d->sub->id < 0