summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaimo Järvi <raimo.jarvi@gmail.com>2012-06-16 15:54:49 +0300
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-06-16 16:55:42 +0200
commit29d0e20a8c335838a2c07f4f517ed6cfa04a74bd (patch)
treea33fdfa3c15fbcf552167ac0bb7c3948366f9b58
parent91429e867ce9ecf0e19ab022fec528a7334a20fe (diff)
mpegtsmux: Fix compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=678211
-rw-r--r--gst/mpegtsmux/mpegtsmux.c2
-rw-r--r--gst/mpegtsmux/tsmux/tsmuxcommon.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index af2117a46..a28bbe9e9 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -527,7 +527,7 @@ mpegtsmux_create_stream (MpegTsMux * mux, MpegTsPadData * ts_data)
goto not_negotiated;
GST_DEBUG_OBJECT (pad, "Creating stream with PID 0x%04x for caps %"
- GST_PTR_FORMAT, caps);
+ GST_PTR_FORMAT, ts_data->pid, caps);
s = gst_caps_get_structure (caps, 0);
g_return_val_if_fail (s != NULL, FALSE);
diff --git a/gst/mpegtsmux/tsmux/tsmuxcommon.h b/gst/mpegtsmux/tsmux/tsmuxcommon.h
index 88d3a49b7..5ff682661 100644
--- a/gst/mpegtsmux/tsmux/tsmuxcommon.h
+++ b/gst/mpegtsmux/tsmux/tsmuxcommon.h
@@ -93,7 +93,7 @@ G_BEGIN_DECLS
#define TSMUX_MIN_ES_DESC_LEN 8
/* Frequency for PCR representation */
-#define TSMUX_SYS_CLOCK_FREQ (27000000L)
+#define TSMUX_SYS_CLOCK_FREQ ((gint64) 27000000)
/* Frequency for PTS values */
#define TSMUX_CLOCK_FREQ (TSMUX_SYS_CLOCK_FREQ / 300)