[vlc-commits] opencv_wrapper: Simplify logic slightly

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Fri Aug 10 13:25:47 2012 -0400| [9f558bfdbb63c7f544bda3f0cad41898b0f996e4] | committer: Jean-Baptiste Kempf

opencv_wrapper: Simplify logic slightly

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/video_filter/opencv_wrapper.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 15afc05..11e0e8c 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -431,18 +431,15 @@ static picture_t* Filter( filter_t* p_filter, picture_t* p_pic )
     }
 
     ReleaseImages( p_filter );
+    picture_Release( p_pic );
 
 #ifndef NDEBUG
     msg_Dbg( p_filter, "Filter() done" );
 #endif
 
-    if( p_filter->p_sys->i_wrapper_output == VINPUT ) {
-        picture_Release( p_pic );
-        return p_outpic;
-    } else if( p_filter->p_sys->i_wrapper_output == PROCESSED ) {
+    if( p_filter->p_sys->i_wrapper_output != NONE ) {
         return p_outpic;
     } else { // NONE
-        picture_Release( p_pic );
         picture_Release( p_outpic );
         return NULL;
     }