← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythtv/mpeg/mpegstreamdata.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2009-09-08 23:08:37 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20090908230837-zrm2j6wutp76hwso
Tags: 0.22.0~trunk21742-0ubuntu1
* New upstream checkout (21742)
  - Fixes FTBFS on PPC. See changeset 21571 for more details.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythtv/mpeg/mpegstreamdata.cpp
548
548
 
549
549
    for (uint i = 0; i < pmt.StreamCount(); i++)
550
550
    {
 
551
        uint pid = pmt.StreamPID(i);
 
552
 
551
553
        desc_list_t desc = MPEGDescriptor::ParseAndExclude(
552
554
            pmt.StreamInfo(i), pmt.StreamInfoLength(i),
553
555
            DescriptorID::conditional_access);
555
557
        uint type = StreamID::Normalize(
556
558
            pmt.StreamType(i), desc, _sistandard);
557
559
 
 
560
        // Fixup for ITV HD
 
561
        if (pid == 3401 && type == StreamID::PrivData &&
 
562
            pmt.ProgramNumber() == 10510)
 
563
        {
 
564
            type = StreamID::H264Video;
 
565
        }
 
566
 
558
567
        bool is_video = StreamID::IsVideo(type);
559
568
        bool is_audio = StreamID::IsAudio(type);
560
569
 
561
 
        uint pid = pmt.StreamPID(i);
562
 
 
563
570
        if (is_audio)
564
571
        {
565
572
            audio_cnt++;