[vlc-commits] commit: Fixed ASF muxer header with extended streams and aspect ratio. ( Laurent Aimar )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May  1 13:39:04 2010 +0200| [4c5b14e37ed14f17be6b7c3769427ff91e39e4e3] | committer: Jean-Baptiste Kempf 

Fixed ASF muxer header with extended streams and aspect ratio.
(cherry picked from commit b1d00bedc55e1996fd5e611c9785cfeb2a58c9b1)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=4c5b14e37ed14f17be6b7c3769427ff91e39e4e3
---

 modules/mux/asf.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index 8d78a69..31beadf 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 );