[vlc-commits] mjpeg: fix callback init order

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May  3 20:10:45 2018 +0300| [92519fab5b07cf26def592010e8c8775e984d112] | committer: Rémi Denis-Courmont

mjpeg: fix callback init order

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

 modules/demux/mjpeg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index c8c63b9ab8..f47311fd44 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -308,7 +308,6 @@ static int Open( vlc_object_t * p_this )
     if( unlikely(p_sys == NULL) )
         return VLC_ENOMEM;
 
-    p_demux->pf_control = Control;
     p_demux->p_sys      = p_sys;
     p_sys->p_es         = NULL;
     p_sys->i_time       = VLC_TS_0;
@@ -388,6 +387,8 @@ static int Open( vlc_object_t * p_this )
     es_format_Init( &p_sys->fmt, VIDEO_ES, VLC_CODEC_MJPG );
 
     p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt );
+
+    p_demux->pf_control = Control;
     return VLC_SUCCESS;
 }