[vlc-commits] demux: ts: don't skip meta update

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Mar  1 10:39:47 2018 +0100| [7bdaaf2f23d1eb7d411ef080b9ca4688b898cf42] | committer: Francois Cartegnie

demux: ts: don't skip meta update

reverts db78e0198f7b3841d28b4a0766721b011bd99fb8

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

 modules/demux/mpeg/ts_si.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ts_si.c b/modules/demux/mpeg/ts_si.c
index be1471ae24..65465fd6ef 100644
--- a/modules/demux/mpeg/ts_si.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -261,10 +261,9 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t *p_sdt )
                                         p_sys->b_broken_charset );
 
                 msg_Dbg( p_demux, "    - type=%"PRIu8" provider=%s name=%s",
-                         pD->i_service_type,
-                         str1 ? str1 : "(null)", str2 ? str2 : "(null)" );
+                         pD->i_service_type, str1, str2 );
 
-                if( str2 != NULL && strcmp( "Service01", str2 ) ) /* Skip bogus libav/ffmpeg SDT */
+                if( !str2 || strcmp( "Service01", str2 ) ) /* Skip bogus libav/ffmpeg SDT */
                 {
                     vlc_meta_SetTitle( p_meta, str2 );
                     vlc_meta_SetPublisher( p_meta, str1 );