summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/qtdemux/qtdemux.c4
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fcb359a2..10fa5c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-04-10 Wim Taymans <wim@fluendo.com>
+ * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
+ Fix parsing of newer stsd chunks again.
+
+2006-04-10 Wim Taymans <wim@fluendo.com>
+
* gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream),
(qtdemux_parse_trak):
Fix framerate calculation.
diff --git a/common b/common
-Subproject 1783855e983a5294434673694e8a57e44980b6f
+Subproject a6710e67fd82147e32a18f1b63177583faffd49
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 490dd130..9321c452 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -3159,10 +3159,12 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
offset = 52;
if (version == 0x00010000) {
stream->samples_per_packet = QTDEMUX_GUINT32_GET (stsd->data + offset);
- stream->samples_per_frame = stream->n_channels;
stream->bytes_per_packet = QTDEMUX_GUINT32_GET (stsd->data + offset + 4);
stream->bytes_per_frame = QTDEMUX_GUINT32_GET (stsd->data + offset + 8);
stream->bytes_per_sample = QTDEMUX_GUINT32_GET (stsd->data + offset + 12);
+ stream->samples_per_frame = (stream->bytes_per_frame /
+ stream->bytes_per_packet) * stream->samples_per_packet;
+
GST_LOG ("samples/packet: %d", stream->samples_per_packet);
GST_LOG ("bytes/packet: %d", stream->bytes_per_packet);