demux: use talloc for sh_* structs and "lang" field

4 files changed, 16 insertions, 17 deletions

diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 0c5b6da769..a3c1143e22 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -351,7 +351,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
             if (title && title->value)
                 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_NAME=%s\n", priv->audio_streams, title->value);
             if (lang && lang->value) {
-              sh_audio->lang = strdup(lang->value);
+              sh_audio->lang = talloc_strdup(sh_audio, lang->value);
               mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", priv->audio_streams, sh_audio->lang);
             }
             if (st->disposition & AV_DISPOSITION_DEFAULT)
@@ -468,7 +468,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
             if (title && title->value)
                 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_NAME=%s\n", priv->sub_streams, title->value);
             if (lang && lang->value) {
-              sh_sub->lang = strdup(lang->value);
+              sh_sub->lang = talloc_strdup(sh_sub, lang->value);
               mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", priv->sub_streams, sh_sub->lang);
             }
             if (st->disposition & AV_DISPOSITION_DEFAULT)
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,
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
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index f2746a465e..d7fed469f9 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -338,7 +338,7 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid)
     if (demuxer->s_streams[id])
         mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id);
     else {
-        sh_sub_t *sh = calloc(1, sizeof(sh_sub_t));
+        struct sh_sub *sh = talloc_zero(demuxer, struct sh_sub);
         demuxer->s_streams[id] = sh;
         sh->sid = sid;
         sh->opts = demuxer->opts;
@@ -352,7 +352,7 @@ struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid,
 {
     struct sh_sub *sh = new_sh_sub_sid(demuxer, id, sid);
     if (lang && lang[0] && strcmp(lang, "und")) {
-        sh->lang = strdup(lang);
+        sh->lang = talloc_strdup(sh, lang);
         mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", sid, lang);
     }
     return sh;
@@ -362,11 +362,10 @@ static void free_sh_sub(sh_sub_t *sh)
 {
     mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
     free(sh->extradata);
-    free(sh->lang);
 #ifdef CONFIG_FFMPEG
     clear_parser((sh_common_t *)sh);
 #endif
-    free(sh);
+    talloc_free(sh);
 }
 
 sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid)
@@ -381,7 +380,7 @@ sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid)
         mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Audio stream header %d redefined.\n", id);
     } else {
         mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found audio stream: %d\n", id);
-        sh_audio_t *sh = calloc(1, sizeof(sh_audio_t));
+        struct sh_audio *sh = talloc_zero(demuxer, struct sh_audio);
         demuxer->a_streams[id] = sh;
         sh->aid = aid;
         sh->ds = demuxer->audio;
@@ -401,11 +400,10 @@ void free_sh_audio(demuxer_t *demuxer, int id)
     mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh);
     free(sh->wf);
     free(sh->codecdata);
-    free(sh->lang);
 #ifdef CONFIG_FFMPEG
     clear_parser((sh_common_t *)sh);
 #endif
-    free(sh);
+    talloc_free(sh);
 }
 
 sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid)
@@ -420,7 +418,7 @@ sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid)
         mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Video stream header %d redefined.\n", id);
     else {
         mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id);
-        sh_video_t *sh = calloc(1, sizeof *sh);
+        struct sh_video *sh = talloc_zero(demuxer, struct sh_video);
         demuxer->v_streams[id] = sh;
         sh->vid = vid;
         sh->ds = demuxer->video;
@@ -437,7 +435,7 @@ void free_sh_video(sh_video_t *sh)
 #ifdef CONFIG_FFMPEG
     clear_parser((sh_common_t *)sh);
 #endif
-    free(sh);
+    talloc_free(sh);
 }
 
 void free_demuxer(demuxer_t *demuxer)