[vlc-commits] codec: zvbi: reorder and clear warning

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jul 23 15:03:00 2019 +0200| [9425a07f4fca19a277a15633559aeb576c665fa1] | committer: Francois Cartegnie

codec: zvbi: reorder and clear warning

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

 modules/codec/zvbi.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index c8970b38a2..cc28bb5194 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -655,10 +655,6 @@ static int OpaquePage( picture_t *p_src, const vbi_page *p_page,
 
             switch( opacity )
             {
-            /* Show video instead of this character */
-            case VBI_TRANSPARENT_SPACE:
-                *p_pixel = 0;
-                break;
             /* Display foreground and background color */
             /* To make the boxed text "closed captioning" transparent
              * change true to false.
@@ -668,10 +664,15 @@ static int OpaquePage( picture_t *p_src, const vbi_page *p_page,
             case VBI_SEMI_TRANSPARENT:
                 if( b_opaque )
                     break;
+                /* fallthrough */
             /* Full text transparency. only foreground color is show */
             case VBI_TRANSPARENT_FULL:
-                if( (*p_pixel) == (0xff000000 | p_page->color_map[background] ) )
-                    *p_pixel = 0;
+                if( (*p_pixel) != (0xff000000 | p_page->color_map[background] ) )
+                    break;
+                /* fallthrough */
+            /* Show video instead of this character */
+            case VBI_TRANSPARENT_SPACE:
+                *p_pixel = 0;
                 break;
             }
         }