[vlc-commits] chroma: chain: fix "force one level of iteration for filters"

Thomas Guillem git at videolan.org
Mon Nov 27 14:35:03 CET 2017


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov 27 14:30:04 2017 +0100| [2aaca35c09878ba1095b14367fa0a4ae06eac660] | committer: Thomas Guillem

chroma: chain: fix "force one level of iteration for filters"

This commit fixes a regression from 6e5e08677d9e279602397fcbc767e6d2a15b4ce5
that caused filter loading to never stop until a stack overflow.

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

 modules/video_chroma/chain.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 74884aff42..6181df1464 100644
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -195,6 +195,8 @@ static int ActivateFilter( vlc_object_t *p_this )
 
     /* Force only one level of iteration when using the chain converter from a
      * filter. */
+    if( var_InheritInteger( p_filter, "chain-level" ) > 0 )
+        return VLC_EGENERIC;
     var_Create( p_filter, "chain-level", VLC_VAR_INTEGER );
     var_SetInteger( p_filter, "chain-level", CHAIN_LEVEL_MAX - 1 );
 



More information about the vlc-commits mailing list