← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/libmythtv/avformatdecoder.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/avformatdecoder.cpp
1185
1185
 
1186
1186
        if (stream->sample_aspect_ratio.num)
1187
1187
            aspect_ratio = av_q2d(stream->sample_aspect_ratio);
1188
 
        else if (enc->sample_aspect_ratio.num == 0)
 
1188
        else if (enc->sample_aspect_ratio.num)
1189
1189
            aspect_ratio = av_q2d(enc->sample_aspect_ratio);
1190
1190
        else
1191
1191
            aspect_ratio = 1.0f;
3398
3398
 
3399
3399
        AVStream *curstream = ic->streams[pkt->stream_index];
3400
3400
 
 
3401
        if (!curstream)
 
3402
        {
 
3403
            VERBOSE(VB_IMPORTANT, LOC_ERR + "Bad stream (NULL)");;
 
3404
            av_free_packet(pkt);
 
3405
            continue;
 
3406
        }
 
3407
 
3401
3408
        if (pkt->dts != (int64_t)AV_NOPTS_VALUE)
3402
3409
            pts = (long long)(av_q2d(curstream->time_base) * pkt->dts * 1000);
3403
3410