Commit 4c5b14e3 authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf

Fixed ASF muxer header with extended streams and aspect ratio.

(cherry picked from commit b1d00bedc55e1996fd5e611c9785cfeb2a58c9b1)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent d4d55d28
...@@ -935,7 +935,6 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast ) ...@@ -935,7 +935,6 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast )
p_track->fmt.video.i_sar_den != 0 ) p_track->fmt.video.i_sar_den != 0 )
{ {
i_cm_size = 26 + 2 * (16 + 2 * sizeof("AspectRatio?")); i_cm_size = 26 + 2 * (16 + 2 * sizeof("AspectRatio?"));
break;
} }
if( p_track->b_extended ) if( p_track->b_extended )
i_header_ext_size += 88; i_header_ext_size += 88;
...@@ -1029,13 +1028,15 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast ) ...@@ -1029,13 +1028,15 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast )
if( i_cm_size ) if( i_cm_size )
{ {
unsigned int i_dst_num, i_dst_den; unsigned int i_dst_num, i_dst_den;
asf_track_t *tk;
tk=NULL;
asf_track_t *tk = NULL;
for( i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ ) for( i = 0; i < vlc_array_count( p_sys->p_tracks ); i++ )
{ {
tk = vlc_array_item_at_index( p_sys->p_tracks, i ); tk = vlc_array_item_at_index( p_sys->p_tracks, i );
if( tk->i_cat == VIDEO_ES ) break; if( tk->i_cat == VIDEO_ES &&
tk->fmt.video.i_sar_num != 0 &&
tk->fmt.video.i_sar_den != 0 )
break;
} }
assert( tk != NULL ); assert( tk != NULL );
......
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