[vlc-commits] mux_ogg: use variable

Rémi Denis-Courmont git at videolan.org
Fri Apr 27 15:32:54 CEST 2018


vlc/vlc-3.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 11 13:57:51 2018 +0200| [02b605006f7567a7d345d62da60a0d3886101f31] | committer: Hugo Beauzée-Luyssen

mux_ogg: use variable

(cherry picked from commit 494aeaab3019001d23fcdfef697d4fd7410f52e6)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=02b605006f7567a7d345d62da60a0d3886101f31
---

 modules/mux/ogg.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 1d57c3f46a..73cc406ced 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -278,7 +278,6 @@ static void Close( vlc_object_t * p_this )
 {
     sout_mux_t     *p_mux = (sout_mux_t*)p_this;
     sout_mux_sys_t *p_sys = p_mux->p_sys;
-    ogg_stream_t *p_stream;
 
     msg_Info( p_mux, "Close" );
 
@@ -290,10 +289,12 @@ static void Close( vlc_object_t * p_this )
         /* Remove deleted logical streams */
         for(int i = 0; i < p_sys->i_del_streams; i++ )
         {
-            OggCreateStreamFooter( p_mux, p_sys->pp_del_streams[i] );
-            free( p_sys->pp_del_streams[i]->p_oggds_header );
-            free( p_sys->pp_del_streams[i]->skeleton.p_index );
-            free( p_sys->pp_del_streams[i] );
+            ogg_stream_t *p_stream = p_sys->pp_del_streams[i];
+
+            OggCreateStreamFooter( p_mux, p_stream );
+            free( p_stream->p_oggds_header );
+            free( p_stream->skeleton.p_index );
+            free( p_stream );
         }
         free( p_sys->pp_del_streams );
         p_sys->i_streams -= p_sys->i_del_streams;



More information about the vlc-commits mailing list