diff options
author | Thomas Vander Stichele <thomas (at) apestaart (dot) org> | 2009-03-02 09:43:30 +0100 |
---|---|---|
committer | Thomas Vander Stichele <thomas (at) apestaart (dot) org> | 2009-03-02 09:43:30 +0100 |
commit | 9f25f96155b246663a1f900624ccda4b9eafcded (patch) | |
tree | 029a4a4e8e96dc27e5f3ba38615bcfe9bee64455 /gst/qtdemux/qtdemux.c | |
parent | 13221762d09f8faacfbd682e68500ff22e6eb8ab (diff) | |
parent | 0083b9e40569db889500a3c1abd7ec3ac8876fee (diff) |
Merge branch 'master' of ssh://thomasvs@git.freedesktop.org/git/gstreamer/gst-plugins-good
Diffstat (limited to 'gst/qtdemux/qtdemux.c')
-rw-r--r-- | gst/qtdemux/qtdemux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index fe555a19..1cff4148 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3109,11 +3109,11 @@ qtdemux_parse_samples (GstQTDemux * qtdemux, QtDemuxStream * stream, index = QT_UINT32 ((guint8 *) stps->data + offset); if (index > 0 && index <= stream->n_samples) { samples[index - 1].keyframe = TRUE; - offset += 4; + offset += 4; + } } } } - } } else { /* no stss, all samples are keyframes */ stream->all_keyframe = TRUE; @@ -4184,6 +4184,7 @@ static const struct FOURCC__des, GST_TAG_DESCRIPTION, NULL, qtdemux_tag_add_str}, { FOURCC__day, GST_TAG_DATE, NULL, qtdemux_tag_add_date}, { FOURCC__too, GST_TAG_COMMENT, NULL, qtdemux_tag_add_str}, { + FOURCC__inf, GST_TAG_COMMENT, NULL, qtdemux_tag_add_str}, { FOURCC_trkn, GST_TAG_TRACK_NUMBER, GST_TAG_TRACK_COUNT, qtdemux_tag_add_num}, { FOURCC_disk, GST_TAG_ALBUM_VOLUME_NUMBER, GST_TAG_ALBUM_VOLUME_COUNT, qtdemux_tag_add_num}, { |