[vlc-commits] mux: mp4: add box_free
Francois Cartegnie
git at videolan.org
Thu Jun 26 22:03:54 CEST 2014
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jun 25 21:34:50 2014 +0200| [4a4bfdbff1d2cc66ca1982f0028bee5a69fe8151] | committer: Francois Cartegnie
mux: mp4: add box_free
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4a4bfdbff1d2cc66ca1982f0028bee5a69fe8151
---
modules/mux/mp4.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index d1a7490..92fe09a 100644
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -1981,6 +1981,12 @@ static bo_t *box_full_new(const char *fcc, uint8_t v, uint32_t f)
return box;
}
+static void box_free(bo_t *box)
+{
+ block_Release(box->b);
+ free(box);
+}
+
static void box_fix(bo_t *box)
{
box->b->p_buffer[0] = box->len >> 24;
@@ -1995,8 +2001,7 @@ static void box_gather (bo_t *box, bo_t *box2)
box->b = block_Realloc(box->b, 0, box->len + box2->len);
memcpy(&box->b->p_buffer[box->len], box2->b->p_buffer, box2->len);
box->len += box2->len;
- block_Release(box2->b);
- free(box2);
+ box_free(box2);
}
static void box_send(sout_mux_t *p_mux, bo_t *box)
More information about the vlc-commits
mailing list