summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2008-09-02 09:46:04 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-09-02 09:46:04 +0000
commitd5e8bc1472e8a3f1b79361347166ac0cb8c944a5 (patch)
tree5f1292722cc24c590bd04b4f27133e4a642bf2cd
parentc35f3328b403bdc5704ea78fbb27a61ede2c7a00 (diff)
downloadgst-plugins-bad-d5e8bc1472e8a3f1b79361347166ac0cb8c944a5.tar.gz
gst-plugins-bad-d5e8bc1472e8a3f1b79361347166ac0cb8c944a5.tar.bz2
gst-plugins-bad-d5e8bc1472e8a3f1b79361347166ac0cb8c944a5.zip
gst/mpegtsmux/tsmux/tsmux.c: Fix build on macosx.
Original commit message from CVS: * gst/mpegtsmux/tsmux/tsmux.c: (tsmux_write_ts_header): Fix build on macosx.
-rw-r--r--ChangeLog5
-rw-r--r--gst/mpegtsmux/tsmux/tsmux.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c73f6b89..293308aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-02 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/mpegtsmux/tsmux/tsmux.c: (tsmux_write_ts_header):
+ Fix build on macosx.
+
2008-09-01 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/mpegtsmux/mpegtsmux_aac.c: (mpegtsmux_prepare_aac):
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c
index ffb92388..1283f9a8 100644
--- a/gst/mpegtsmux/tsmux/tsmux.c
+++ b/gst/mpegtsmux/tsmux/tsmux.c
@@ -609,7 +609,7 @@ tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi,
guint8 *tmp;
guint8 adaptation_flag;
guint8 adapt_min_length = 0;
- guint8 adapt_len;
+ guint8 adapt_len = 0;
guint payload_len;
gboolean write_adapt = FALSE;
@@ -659,8 +659,6 @@ tsmux_write_ts_header (guint8 * buf, TsMuxPacketInfo * pi,
/* Should have written at least the number of bytes we requested */
g_assert (adapt_len >= adapt_min_length);
- } else {
- adapt_len = 0;
}
/* The amount of packet data we wrote is the remaining space after