← Back to branch summary

~ubuntu-branches/ubuntu/raring/gst-plugins-good0.10/raring-proposed

« back to all changes in this revision

Viewing changes to gst/matroska/matroska-read-common.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-02-09 16:44:53 UTC
  • mfrom: (40.2.38 experimental)
  • Revision ID: package-import@ubuntu.com-20120209164453-6hjokwrvdn42zopb
Tags: 0.10.30.3-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - 04_move_farsight_plugins_to_good.patch
    Import autoconvert, dtmf, liveadder, rptmux from -plugins-bad
  - 05_move_shm_to_good.patch
    Import shm from -plugins-bad.
  - 07_move-camerabin.patch
    Import camerabin, camerabin2, jpegformat and basecamerabinsrc
    from -plugins-bad.
  - control*:
    * Drop dependency from gstreamer0.10-plugins-good on
      gstreamer0.10-gconf. It pulls gconf and gtk3 onto the Kubuntu cd.
    * Use Breaks instead of Conflicts.
    * Add a 'Pre-Depends: ${misc:Pre-Depends}' to the plugin package,
      since we're shipping shared libraries in the package that Debian
      isn't.
* Update the patches by pulling new version of the code from
  -plugins-bad 0.10.22.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst/matroska/matroska-read-common.c
633
633
    else
634
634
      gst_tag_list_add (taglist, GST_TAG_MERGE_APPEND, GST_TAG_ATTACHMENT,
635
635
          tagbuffer, NULL);
 
636
 
 
637
    /* the tag list adds it own ref */
 
638
    gst_buffer_unref (tagbuffer);
636
639
  }
637
640
 
638
641
  g_free (filename);
982
985
 
983
986
  DEBUG_ELEMENT_STOP (common, ebml, "CueTrackPositions", ret);
984
987
 
 
988
  /* (e.g.) lavf typically creates entries without a block number,
 
989
   * which is bogus and leads to contradictory information */
 
990
  if (common->index->len) {
 
991
    GstMatroskaIndex *last_idx;
 
992
 
 
993
    last_idx = &g_array_index (common->index, GstMatroskaIndex,
 
994
        common->index->len - 1);
 
995
    if (last_idx->block == idx.block && last_idx->pos == idx.pos &&
 
996
        last_idx->track == idx.track && idx.time > last_idx->time) {
 
997
      GST_DEBUG_OBJECT (common, "Cue entry refers to same location, "
 
998
          "but has different time than previous entry; discarding");
 
999
      idx.track = 0;
 
1000
    }
 
1001
  }
 
1002
 
985
1003
  if ((ret == GST_FLOW_OK || ret == GST_FLOW_UNEXPECTED)
986
1004
      && idx.pos != (guint64) - 1 && idx.track > 0) {
987
1005
    g_array_append_val (common->index, idx);