[vlc-commits] demux: flac: create ES after meta (fix #15219)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Apr 10 15:11:13 2017 +0200| [675a0eeb694cab659e24934cbf5dec173b3252e7] | committer: Francois Cartegnie

demux: flac: create ES after meta (fix #15219)

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

 modules/demux/flac.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index 575ac090db..237ef3e9d8 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -159,13 +159,6 @@ static int Open( vlc_object_t * p_this )
     if( ParseHeaders( p_demux, &fmt ) )
         goto error;
 
-    p_sys->p_es = es_out_Add( p_demux->out, &fmt );
-    if( !p_sys->p_es )
-    {
-        es_format_Clean( &fmt );
-        goto error;
-    }
-
     /* Load the FLAC packetizer */
     p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "flac" );
     if( !p_sys->p_packetizer )
@@ -180,6 +173,14 @@ static int Open( vlc_object_t * p_this )
                   p_sys->attachments[p_sys->i_cover_idx]->psz_name );
         vlc_meta_Set( p_sys->p_meta, vlc_meta_ArtworkURL, psz_url );
     }
+
+    p_sys->p_es = es_out_Add( p_demux->out, &fmt );
+    if( !p_sys->p_es )
+    {
+        es_format_Clean( &fmt );
+        goto error;
+    }
+
     return VLC_SUCCESS;
 error:
     Close( p_this );