summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2009-01-05 17:41:51 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2009-01-05 17:41:51 +0000
commit3a2cdc25e14b62e3ed0310a5aa28c26b144a150d (patch)
treec5e4429ac4ac7c5d113dcd093956453d2727deaf
parentf0ed18f2ed9f2c7bd6b32760d8cb132e0dc48c62 (diff)
downloadgstreamer-plugins-bad-3a2cdc25e14b62e3ed0310a5aa28c26b144a150d.tar.gz
gst/mpegdemux/mpegtspacketizer.c: Guard interval is 4 if descriptor part shows binary 11 (3 not 4).
Original commit message from CVS: * gst/mpegdemux/mpegtspacketizer.c: Guard interval is 4 if descriptor part shows binary 11 (3 not 4).
-rw-r--r--ChangeLog5
-rw-r--r--gst/mpegdemux/mpegtspacketizer.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 007c6a719..ff459927a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-01-05 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+ * gst/mpegdemux/mpegtspacketizer.c:
+ Guard interval is 4 if descriptor part shows binary 11 (3 not 4).
+
+2009-01-05 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
* gst/mpegdemux/gstmpegdesc.h:
Fix up satellite delivery subsystem defs.
diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c
index ea093c439..507271d86 100644
--- a/gst/mpegdemux/mpegtspacketizer.c
+++ b/gst/mpegdemux/mpegtspacketizer.c
@@ -888,7 +888,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
default:
code_rate_lp_str = "reserved";
}
- /* guard is 32 if 0, 16 if 1, 8 if 2, 4 if 4 */
+ /* guard is 32 if 0, 16 if 1, 8 if 2, 4 if 3 */
switch (guard_interval) {
case 0:
guard_interval = 32;
@@ -899,7 +899,7 @@ mpegts_packetizer_parse_nit (MpegTSPacketizer * packetizer,
case 2:
guard_interval = 8;
break;
- case 4:
+ case 3:
guard_interval = 4;
break;
default: /* make it default to 32 */