[vlc-commits] chroma: chain: setup proxy callbacks on filter object

Thomas Guillem git at videolan.org
Mon Nov 27 16:33:29 CET 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov 27 15:15:23 2017 +0100| [c5085da7ae4fcc52872b3f6cedb558c293401b63] | committer: Thomas Guillem

chroma: chain: setup proxy callbacks on filter object

p_filter is already the parent of p_sys->p_video_filter. We don't need to touch
the grand parent.

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

 modules/video_chroma/chain.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 6181df1464..f13d3d635c 100644
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -155,8 +155,7 @@ static int Activate( filter_t *p_filter, int (*pf_build)(filter_t *) )
     {
         /* Hum ... looks like this really isn't going to work. Too bad. */
         if (p_sys->p_video_filter)
-            filter_DelProxyCallbacks( p_filter->obj.parent,
-                                      p_sys->p_video_filter,
+            filter_DelProxyCallbacks( p_filter, p_sys->p_video_filter,
                                       RestartFilterCallback );
         filter_chain_Delete( p_sys->p_chain );
         free( p_sys );
@@ -209,8 +208,7 @@ static void Destroy( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
 
     if (p_filter->p_sys->p_video_filter)
-        filter_DelProxyCallbacks( p_filter->obj.parent,
-                                  p_filter->p_sys->p_video_filter,
+        filter_DelProxyCallbacks( p_filter, p_filter->p_sys->p_video_filter,
                                   RestartFilterCallback );
     filter_chain_Delete( p_filter->p_sys->p_chain );
     free( p_filter->p_sys );
@@ -354,7 +352,7 @@ static int BuildFilterChain( filter_t *p_filter )
                                            &fmt_mid, &fmt_mid );
             if( p_filter->p_sys->p_video_filter )
             {
-                filter_AddProxyCallbacks( p_filter->obj.parent,
+                filter_AddProxyCallbacks( p_filter,
                                           p_filter->p_sys->p_video_filter,
                                           RestartFilterCallback );
                 if (p_filter->p_sys->p_video_filter->pf_video_mouse != NULL)



More information about the vlc-commits mailing list