← Back to branch summary

~ubuntu-branches/ubuntu/feisty/gst-plugins-good0.10/feisty-security

« back to all changes in this revision

Viewing changes to ext/annodex/gstcmmldec.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-12-21 21:12:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20061221211215-3uukkusokhe0nk4f
Tags: 0.10.5-0ubuntu1
* Sync with pkg-gstreamer SVN:
  + debian/rules:
    - Use Ubuntu as distribution name and point to the proper Launchpad URL
  + debian/patches/01_esdsink-priority.patch:
    - Mark the esdsink with rank primary-2 to get
      pulse > alsadmix > esd > alsa > oss

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/annodex/gstcmmldec.c
391
391
  /* handle the packet. the handler will set dec->flow_return */
392
392
  switch (packet) {
393
393
    case GST_CMML_PACKET_IDENT_HEADER:
394
 
      gst_cmml_dec_parse_ident_header (dec, buffer);
 
394
      if (dec->sent_root == FALSE)
 
395
        /* don't parse the ident again in case of seeking to the beginning */
 
396
        gst_cmml_dec_parse_ident_header (dec, buffer);
395
397
      break;
396
398
    case GST_CMML_PACKET_FIRST_HEADER:
397
 
      gst_cmml_dec_parse_first_header (dec, buffer);
 
399
      if (dec->sent_root == FALSE)
 
400
        /* don't parse the xml preamble if it has already been parsed because it
 
401
         * would error out, so seeking to the beginning would fail */
 
402
        gst_cmml_dec_parse_first_header (dec, buffer);
398
403
      break;
399
404
    case GST_CMML_PACKET_SECOND_HEADER:
400
405
    case GST_CMML_PACKET_CLIP: