[vlc-commits] vout: inline VoutDestructor()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 16 17:31:48 2019 +0200| [d3dee92f559e01aa0d17884d03715fe4d7570dfd] | committer: Rémi Denis-Courmont

vout: inline VoutDestructor()

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

 src/video_output/video_output.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 40a8383d61..076ea49557 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1699,8 +1699,6 @@ void vout_Close(vout_thread_t *vout)
     vout_Release(vout);
 }
 
-static void VoutDestructor(vout_thread_t *vout);
-
 void vout_Release(vout_thread_t *vout)
 {
     vout_thread_sys_t *sys = vout->p;
@@ -1708,12 +1706,6 @@ void vout_Release(vout_thread_t *vout)
     if (atomic_fetch_sub_explicit(&sys->refs, 1, memory_order_release))
         return;
 
-    VoutDestructor(vout);
-    vlc_object_delete(VLC_OBJECT(vout));
-}
-
-static void VoutDestructor(vout_thread_t *vout)
-{
     free(vout->p->splitter_name);
 
     /* Destroy the locks */
@@ -1728,6 +1720,7 @@ static void VoutDestructor(vout_thread_t *vout)
     /* */
     vout_snapshot_Destroy(vout->p->snapshot);
     video_format_Clean(&vout->p->original);
+    vlc_object_delete(VLC_OBJECT(vout));
 }
 
 vout_thread_t *vout_Create(vlc_object_t *object)