Commit e89d6931 authored by Laurent Aimar's avatar Laurent Aimar

* avi: fixed a cast of lvalue.

 * livedotcom, mkv: removed all TAB_*.
parent 0101fe51
...@@ -343,7 +343,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -343,7 +343,8 @@ static int Open( vlc_object_t * p_this )
tk->i_blockno = 0; tk->i_blockno = 0;
tk->i_blocksize = 0; tk->i_blocksize = 0;
p_auds = (void*)p_vids = (void*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 ); p_vids = (avi_chunk_strf_vids_t*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 );
p_auds = (avi_chunk_strf_auds_t*)AVI_ChunkFind( p_strl, AVIFOURCC_strf, 0 );
if( p_strl == NULL || p_strh == NULL || p_auds == NULL || p_vids == NULL ) if( p_strl == NULL || p_strh == NULL || p_auds == NULL || p_vids == NULL )
{ {
......
...@@ -648,9 +648,12 @@ static int DemuxOpen ( vlc_object_t *p_this ) ...@@ -648,9 +648,12 @@ static int DemuxOpen ( vlc_object_t *p_this )
if( tk->p_es || tk->b_quicktime || tk->b_muxed ) if( tk->p_es || tk->b_quicktime || tk->b_muxed )
{ {
TAB_APPEND( p_sys->i_track, p_sys->track, tk );
tk->readSource = sub->readSource(); tk->readSource = sub->readSource();
tk->rtpSource = sub->rtpSource(); tk->rtpSource = sub->rtpSource();
/* Append */
p_sys->track = (live_track_t**)realloc( p_sys->track, sizeof( live_track_t ) * ( p_sys->i_track + 1 ) );
p_sys->track[p_sys->i_track++] = tk;
} }
else else
{ {
......
...@@ -2240,7 +2240,9 @@ static void InformationsCreate( input_thread_t *p_input ) ...@@ -2240,7 +2240,9 @@ static void InformationsCreate( input_thread_t *p_input )
mkv_track_t *tk = &p_sys->track[i_track]; mkv_track_t *tk = &p_sys->track[i_track];
vlc_meta_t *mtk = vlc_meta_New(); vlc_meta_t *mtk = vlc_meta_New();
TAB_APPEND( p_sys->meta->i_track, p_sys->meta->track, mtk ); p_sys->meta->track = (vlc_meta_t**)realloc( p_sys->meta->track,
sizeof( vlc_meta_t * ) * ( p_sys->meta->i_track + 1 ) );
p_sys->meta->track[p_sys->meta->i_track++] = mtk;
if( tk->fmt.psz_description ) if( tk->fmt.psz_description )
{ {
......
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