summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Pölsterl <sebp@k-d-w.org>2008-12-29 16:18:47 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-12-29 16:18:47 +0000
commitb4152f7308c248ebb5c106da67bd8c52212287e1 (patch)
tree2ddbbf7a8e71010561e8ce2b38566be04e7fa2e2
parent52b0e40115990074001fef41a779d45f49cca358 (diff)
downloadgst-plugins-bad-b4152f7308c248ebb5c106da67bd8c52212287e1.tar.gz
gst-plugins-bad-b4152f7308c248ebb5c106da67bd8c52212287e1.tar.bz2
gst-plugins-bad-b4152f7308c248ebb5c106da67bd8c52212287e1.zip
gst/mpegdemux/mpegtspacketizer.c: Add a scrambled field to the service structures retrieved from SDT to determine if ...
Original commit message from CVS: Patch by: Sebastian Pölsterl <sebp at k-d-w dot org> * gst/mpegdemux/mpegtspacketizer.c: (mpegts_packetizer_parse_sdt): Add a scrambled field to the service structures retrieved from SDT to determine if a channel is scrambled. Fixes #565613.
-rw-r--r--ChangeLog8
-rw-r--r--gst/mpegdemux/mpegtspacketizer.c9
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d3fb2156..e6d5924c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-12-29 Wim Taymans <wim.taymans@collabora.co.uk>
+ Patch by: Sebastian Pölsterl <sebp at k-d-w dot org>
+
+ * gst/mpegdemux/mpegtspacketizer.c: (mpegts_packetizer_parse_sdt):
+ Add a scrambled field to the service structures retrieved from SDT to
+ determine if a channel is scrambled. Fixes #565613.
+
+2008-12-29 Wim Taymans <wim.taymans@collabora.co.uk>
+
Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
* gst/pcapparse/Makefile.am:
diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index 8c5fcc9c..2c0b946d 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -1303,10 +1303,11 @@ mpegts_packetizer_parse_sdt (MpegTSPacketizer * packetizer,
get_encoding_and_convert (serviceprovider_name,
serviceprovider_name_length);
- gst_structure_set (service, "name", G_TYPE_STRING, servicename_tmp,
- NULL);
- gst_structure_set (service, "provider-name", G_TYPE_STRING,
- serviceprovider_name_tmp, NULL);
+ gst_structure_set (service,
+ "name", G_TYPE_STRING, servicename_tmp,
+ "provider-name", G_TYPE_STRING, serviceprovider_name_tmp,
+ "scrambled", G_TYPE_BOOLEAN, scrambled, NULL);
+
g_free (servicename_tmp);
g_free (serviceprovider_name_tmp);
}