From 4c5b14e37ed14f17be6b7c3769427ff91e39e4e3 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sat, 1 May 2010 13:39:04 +0200 Subject: [PATCH] Fixed ASF muxer header with extended streams and aspect ratio. (cherry picked from commit b1d00bedc55e1996fd5e611c9785cfeb2a58c9b1) Signed-off-by: Jean-Baptiste Kempf --- modules/mux/asf.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/mux/asf.c b/modules/mux/asf.c index 8d78a69ad5..31beadf9b8 100644 --- a/modules/mux/asf.c +++ b/modules/mux/asf.c @@ -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 ) { i_cm_size = 26 + 2 * (16 + 2 * sizeof("AspectRatio?")); - break; } if( p_track->b_extended ) i_header_ext_size += 88; @@ -1029,13 +1028,15 @@ static block_t *asf_header_create( sout_mux_t *p_mux, bool b_broadcast ) if( i_cm_size ) { 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++ ) { 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 ); -- 2.11.4.GIT