[vlc-commits] demux: ogg: apply skeleton prior to es creation too

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Dec 26 16:44:26 2013 +0100| [38c15dd561fe9de8f753d0b93cdba4c41b22cc6e] | committer: Francois Cartegnie

demux: ogg: apply skeleton prior to es creation too

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

 modules/demux/ogg.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 344df9d..5943bf6 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -336,13 +336,16 @@ static int Demux( demux_t * p_demux )
                     for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
                     {
                         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
-                        if ( p_stream->b_have_updated_format && p_stream->p_es )
+                        if ( p_stream->b_have_updated_format )
                         {
                             p_stream->b_have_updated_format = false;
                             if ( p_stream->p_skel ) Ogg_ApplySkeleton( p_stream );
-                            msg_Dbg( p_demux, "Resetting format for stream %d", i_stream );
-                            es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
-                                            p_stream->p_es, &p_stream->fmt );
+                            if ( p_stream->p_es )
+                            {
+                                msg_Dbg( p_demux, "Resetting format for stream %d", i_stream );
+                                es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
+                                                p_stream->p_es, &p_stream->fmt );
+                            }
                         }
                     }
                 }