[vlc-devel] [PATCH] demux/subtitle: ParseJSS: remove redundant check

Filip Roséen filip at atch.se
Thu May 18 12:19:35 CEST 2017


If the relevant char compares equal to either \r or \n, it will of
course not compare equal to \0.
---
 modules/demux/subtitle.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 9b417ce454..cea8cc4d48 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -1903,8 +1903,7 @@ static int ParseJSS( vlc_object_t *p_obj, subs_properties_t *p_props,
             if( (*(psz_text + 1 ) ) == '~' || (*(psz_text + 1 ) ) == '{' ||
                 (*(psz_text + 1 ) ) == '\\' )
                 psz_text++;
-            else if( ( *(psz_text + 1 ) == '\r' ||  *(psz_text + 1 ) == '\n' ) &&
-                     *(psz_text + 1 ) != '\0' )
+            else if( *(psz_text + 1 ) == '\r' || *(psz_text + 1 ) == '\n' )
             {
                 psz_text++;
             }
-- 
2.12.2


More information about the vlc-devel mailing list