summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2007-04-12 10:52:02 +0000
committerWim Taymans <wim.taymans@gmail.com>2007-04-12 10:52:02 +0000
commitea885f5afe2a266524a039d6d84ba3316158b091 (patch)
tree9eeb738028e48a566ebb8047eb656a741fb40203
parentbf930a161f594cf23f596d6078544862a223876a (diff)
downloadgst-plugins-bad-ea885f5afe2a266524a039d6d84ba3316158b091.tar.gz
gst-plugins-bad-ea885f5afe2a266524a039d6d84ba3316158b091.tar.bz2
gst-plugins-bad-ea885f5afe2a266524a039d6d84ba3316158b091.zip
gst/qtdemux/qtdemux.c: Make timescale 32 bits again so we don't screw up the pts_offset calculations.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: Make timescale 32 bits again so we don't screw up the pts_offset calculations.
-rw-r--r--ChangeLog6
-rw-r--r--gst/qtdemux/qtdemux.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c6841271..1f226f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-04-12 Wim Taymans <wim@fluendo.com>
+ * gst/qtdemux/qtdemux.c:
+ Make timescale 32 bits again so we don't screw up the pts_offset
+ calculations.
+
+2007-04-12 Wim Taymans <wim@fluendo.com>
+
* gst/rtpmanager/gstrtpbin.c: (create_session), (get_pt_map),
(create_stream), (gst_rtp_bin_class_init), (pt_map_requested):
Emit pt map requests and cache results.
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 1cd0f3b8..66bc04ea 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -117,7 +117,7 @@ struct _QtDemuxStream
/* duration/scale */
guint64 duration; /* in timescale */
- guint64 timescale;
+ guint32 timescale;
/* our samples */
guint32 n_samples;