vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Apr 22 11:03:29 2016 +0200| [fb5b64f3ad20e5f387134831b96c80392b843034] | committer: Francois Cartegnie
mux: ts: do not generate registered network-id > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fb5b64f3ad20e5f387134831b96c80392b843034 --- modules/mux/mpeg/ts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 039da28..89fe735 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -592,11 +592,11 @@ static int Open( vlc_object_t *p_this ) else p_sys->i_tsid = nrand48(subi) & 0xffff; - p_sys->sdt.i_netid = nrand48(subi) & 0xffff; - var_Get( p_mux, SOUT_CFG_PREFIX "netid", &val ); if ( val.i_int ) p_sys->sdt.i_netid = val.i_int; + else + p_sys->sdt.i_netid = 0xff00 | ( nrand48(subi) & 0xff ); p_sys->i_pmt_version_number = nrand48(subi) & 0x1f; p_sys->sdt.ts.i_pid = 0x11; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
