[vlc-commits] pulse: redundant initialization

Rémi Denis-Courmont git at videolan.org
Wed Oct 23 21:38:21 CEST 2013


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct 23 20:51:50 2013 +0300| [59d981e510c04f7a7674cf531ccad8d040c6c0f3] | committer: Rémi Denis-Courmont

pulse: redundant initialization

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

 modules/audio_output/pulse.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 39b9898..8a09423 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -811,7 +811,6 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
     attr.minreq = pa_usec_to_bytes(AOUT_MIN_PREPARE_TIME, &ss);
     attr.fragsize = 0; /* not used for output */
 
-    sys->stream = NULL;
     sys->trigger = NULL;
     sys->first_pts = VLC_TS_INVALID;
 
@@ -872,6 +871,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
         vlc_pa_error(aout, "stream creation failure", sys->context);
         return VLC_EGENERIC;
     }
+    assert(sys->stream == NULL);
     sys->stream = s;
     pa_stream_set_state_callback(s, stream_state_cb, sys->mainloop);
     pa_stream_set_buffer_attr_callback(s, stream_buffer_attr_cb, aout);



More information about the vlc-commits mailing list