vlc/vlc-3.0 | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Tue Feb 
13 19:07:54 2018 +0200| [a2a4fc3dcd7d8392acc0e1f2e842413be5a47f91] | committer: 
Rémi Denis-Courmont

es_out: deobfuscate expression (fixes #19635)

(cherry picked from commit 581bd93a578720599b29c6c1173b4e23575f26a2)
Signed-off-by: Rémi Denis-Courmont <r...@remlab.net>

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

 src/input/es_out.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 4b7db14ac4..02ba4f6a15 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1259,8 +1259,9 @@ static void EsOutProgramMeta( es_out_t *out, int i_group, 
const vlc_meta_t *p_me
     {
         const char *psz_current_title = vlc_meta_Get( p_pgrm->p_meta, 
vlc_meta_Title );
         const char *psz_new_title = vlc_meta_Get( p_meta, vlc_meta_Title );
-        if( !psz_current_title != !psz_new_title ||
-            ( psz_new_title && psz_new_title && strcmp(psz_new_title, 
psz_current_title)) )
+        if( (psz_current_title != NULL && psz_new_title != NULL)
+            ? strcmp(psz_new_title, psz_current_title)
+            : (psz_current_title != psz_new_title) )
         {
             /* Remove old entries */
             char *psz_oldinfokey = EsOutProgramGetMetaName( p_pgrm );

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to