[vlc-commits] commit: AVI : Don' t free uninitialized ES format descriptor for DV muxed in AVI. (Jai Menon )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Jai Menon <jmenon86 at gmail.com> | Mon May 24 21:13:22 2010 +0200| [d13c8c50dcef21f0c86bcdbcddb35f1ae7367e79] | committer: Rémi Denis-Courmont 

AVI : Don't free uninitialized ES format descriptor for DV muxed in AVI.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit adeaefc878674b3f79b935cb406d8fea9da9de54)

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=d13c8c50dcef21f0c86bcdbcddb35f1ae7367e79
---

 modules/demux/avi/avi.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 6d2e304..10ea1a6 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -643,7 +643,10 @@ static int Open( vlc_object_t * p_this )
         if( tk->p_out_muxed == NULL )
             tk->p_es = es_out_Add( p_demux->out, &fmt );
         TAB_APPEND( p_sys->i_track, p_sys->track, tk );
-        es_format_Clean( &fmt );
+        if(!p_sys->b_muxed )
+        {
+            es_format_Clean( &fmt );
+        }
     }
 
     if( p_sys->i_track <= 0 )