avformat: set pf_* after everything else in init

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index d15efe9d80afc1c029d43cde1a9b78a45f1790f2..a8c451939b8e276cc3770f8dd36115cc7d810a22 100644 (file)
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -106,11 +106,6 @@ int OpenMux( vlc_object_t *p_this )
       return VLC_EGENERIC;
     }
 
-    /* Fill p_mux fields */
-    p_mux->pf_control   = Control;
-    p_mux->pf_addstream = AddStream;
-    p_mux->pf_delstream = DelStream;
-    p_mux->pf_mux       = Mux;
     p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) );
     if( !p_sys )
         return VLC_ENOMEM;
@@ -136,6 +131,12 @@ int OpenMux( vlc_object_t *p_this )
     p_sys->b_error = false;
     p_sys->i_initial_dts = 0;
 
+    /* Fill p_mux fields */
+    p_mux->pf_control   = Control;
+    p_mux->pf_addstream = AddStream;
+    p_mux->pf_delstream = DelStream;
+    p_mux->pf_mux       = Mux;
+
     return VLC_SUCCESS;
 }