[vlc-commits] Mark --ts-es-id-pid as safe

[Rémi Denis-Courmont]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 18 17:14:10 2011 +0300| [b63d85092941e72046f12ad949f63f5e388c7b94] | committer: Rémi Denis-Courmont

Mark --ts-es-id-pid as safe

It merely changes the mapping of track IDs. This can be used along
with --audio-track-id which is already marked safe.

This should fix Debian #466323.
(cherry picked from commit 6fe257af7ac15b8d524253bf34c23556323bdd00)

Conflicts:

	modules/demux/ts.c

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

 modules/demux/ts.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 8ef7b94..b165433 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -168,6 +168,7 @@ vlc_module_begin ()
 
     add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true )
     add_bool( "ts-es-id-pid", true, NULL, PID_TEXT, PID_LONGTEXT, true )
+        change_safe()
     add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true )
     add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
                  MTUOUT_LONGTEXT, true )