[vlc-commits] demux: ts: reject ffmpeg/libav default SDT

2018-02-23 Thread Francois Cartegnie 
vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Fri Feb 
23 11:43:29 2018 +0100| [3c31372b03239566aa54ea11420d7cf858e67c31] | committer: 
Francois Cartegnie

demux: ts: reject ffmpeg/libav default SDT

(cherry picked from commit ffc0159b42592621559b12fc9201d6cc6093fa40)

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

 modules/demux/mpeg/ts_si.c | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mpeg/ts_si.c b/modules/demux/mpeg/ts_si.c
index 9fafed94e0..f1ba72b421 100644
--- a/modules/demux/mpeg/ts_si.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -263,10 +263,13 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t 
*p_sdt )
 msg_Dbg( p_demux, "- type=%"PRIu8" provider=%s name=%s",
  pD->i_service_type, str1, str2 );
 
-vlc_meta_SetTitle( p_meta, str2 );
-vlc_meta_SetPublisher( p_meta, str1 );
-if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
-psz_type = ppsz_type[pD->i_service_type];
+if( strcmp( "Service01", str2 ) ) /* Skip bogus libav/ffmpeg 
SDT */
+{
+vlc_meta_SetTitle( p_meta, str2 );
+vlc_meta_SetPublisher( p_meta, str1 );
+if( pD->i_service_type >= 0x01 && pD->i_service_type <= 
0x10 )
+psz_type = ppsz_type[pD->i_service_type];
+}
 free( str1 );
 free( str2 );
 }

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

[vlc-commits] demux: ts: reject ffmpeg/libav default SDT

2018-02-23 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Fri Feb 23 
11:43:29 2018 +0100| [ffc0159b42592621559b12fc9201d6cc6093fa40] | committer: 
Francois Cartegnie

demux: ts: reject ffmpeg/libav default SDT

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

 modules/demux/mpeg/ts_si.c | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mpeg/ts_si.c b/modules/demux/mpeg/ts_si.c
index 466e610617..adb7ad5833 100644
--- a/modules/demux/mpeg/ts_si.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -263,10 +263,13 @@ static void SDTCallBack( demux_t *p_demux, dvbpsi_sdt_t 
*p_sdt )
 msg_Dbg( p_demux, "- type=%"PRIu8" provider=%s name=%s",
  pD->i_service_type, str1, str2 );
 
-vlc_meta_SetTitle( p_meta, str2 );
-vlc_meta_SetPublisher( p_meta, str1 );
-if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
-psz_type = ppsz_type[pD->i_service_type];
+if( strcmp( "Service01", str2 ) ) /* Skip bogus libav/ffmpeg 
SDT */
+{
+vlc_meta_SetTitle( p_meta, str2 );
+vlc_meta_SetPublisher( p_meta, str1 );
+if( pD->i_service_type >= 0x01 && pD->i_service_type <= 
0x10 )
+psz_type = ppsz_type[pD->i_service_type];
+}
 free( str1 );
 free( str2 );
 }

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