[vlc-commits] stream: call pf_destroy first when deleting stream

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Aug 29 18:43:18 2015 +0200| [5b284975a05d0e9bf7b9913f2373ffd997de98ff] | committer: Francois Cartegnie

stream: call pf_destroy first when deleting stream

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

 src/input/stream.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/input/stream.c b/src/input/stream.c
index beb8817..d0e2bf5 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -90,14 +90,15 @@ void stream_Delete(stream_t *s)
 {
     stream_priv_t *priv = (stream_priv_t *)s;
 
+    if (s->pf_destroy != NULL)
+        s->pf_destroy(s);
+
     if (priv->text.conv != (vlc_iconv_t)(-1))
         vlc_iconv_close(priv->text.conv);
+
     if (priv->peek != NULL)
         block_Release(priv->peek);
 
-    if (s->pf_destroy != NULL)
-        s->pf_destroy(s);
-
     free(s->psz_url);
     vlc_object_release(s);
 }