[vlc-commits] commit: TS mux: fix use of non-existent variables ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct 25 18:35:32 2010 +0300| [b14e2dc4e2df4eed3efb69bcb264f0931b811012] | committer: Rémi Denis-Courmont 

TS mux: fix use of non-existent variables

See http://forum.videolan.org/viewtopic.php?f=13&t=83706
(cherry picked from commit 6c24f08b6b396f2e9737277a2b02c3446474dd16)

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

 modules/mux/mpeg/ts.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 34e4e3e..0278556 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -254,10 +254,13 @@ vlc_module_end ()
  * Local data structures
  *****************************************************************************/
 static const char *const ppsz_sout_options[] = {
-    "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid", "netid",
+    "pid-video", "pid-audio", "pid-spu", "pid-pmt", "tsid",
+#ifdef HAVE_DVBPSI_SDT
+    "netid", "sdtdesc",
+#endif
     "es-id-pid", "shaping", "pcr", "bmin", "bmax", "use-key-frames",
     "dts-delay", "csa-ck", "csa2-ck", "csa-use", "csa-pkt", "crypt-audio", "crypt-video",
-    "muxpmt", "sdtdesc", "program-pmt", "alignment",
+    "muxpmt", "program-pmt", "alignment",
     NULL
 };