Skip to content

V
vlc
Commit de398e6b authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: libmp4: set pf_free on specific struct allocation 

drops the useless tables entries
parent 5da18afa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 486 additions and 525 deletions
modules/demux/mp4/libmp4.c
View file @ de398e6b
This diff is collapsed.
modules/demux/mp4/libmp4.h
View file @ de398e6b
...@@ -1564,7 +1564,7 @@ static inline size_t mp4_box_headersize( MP4_Box_t *p_box ) ...@@ -1564,7 +1564,7 @@ static inline size_t mp4_box_headersize( MP4_Box_t *p_box )
p_str = NULL; \ p_str = NULL; \
} }
#define MP4_READBOX_ENTER_PARTIAL( MP4_Box_data_TYPE_t, maxread ) \ #define MP4_READBOX_ENTER_PARTIAL( MP4_Box_data_TYPE_t, maxread, release ) \
int64_t i_read = p_box->i_size; \ int64_t i_read = p_box->i_size; \
if( maxread < (uint64_t)i_read ) i_read = maxread;\ if( maxread < (uint64_t)i_read ) i_read = maxread;\
uint8_t *p_peek, *p_buff; \ uint8_t *p_peek, *p_buff; \
...@@ -1587,10 +1587,11 @@ static inline size_t mp4_box_headersize( MP4_Box_t *p_box ) ...@@ -1587,10 +1587,11 @@ static inline size_t mp4_box_headersize( MP4_Box_t *p_box )
{ \ { \
free( p_buff ); \ free( p_buff ); \
return( 0 ); \ return( 0 ); \
} }\
p_box->pf_free = release;
#define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t ) \ #define MP4_READBOX_ENTER( MP4_Box_data_TYPE_t, release ) \
MP4_READBOX_ENTER_PARTIAL( MP4_Box_data_TYPE_t, p_box->i_size ) MP4_READBOX_ENTER_PARTIAL( MP4_Box_data_TYPE_t, p_box->i_size, release )
#define MP4_READBOX_EXIT( i_code ) \ #define MP4_READBOX_EXIT( i_code ) \
do \ do \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment