← 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-10-02 00:23:18 UTC
  • mfrom: (1.1.36 upstream)
  • Revision ID: james.westby@ubuntu.com-20091002002318-5qu2fr0gxl59egft
Tags: 0.22.0~trunk22167-0ubuntu1
* New upstream checkout (r22167).
  - Fixes some segfaults.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythtv/avformatdecoder.cpp
3373
3373
            if (ringBuffer->isDVD() &&
3374
3374
                ringBuffer->DVD()->InStillFrame())
3375
3375
            {
3376
 
                mpeg_seq_end_seen = false;
3377
 
                decodeStillFrame = false;
3378
 
                ringBuffer->DVD()->InStillFrame(false);
 
3376
                AVStream *curstream = ic->streams[pkt->stream_index];
 
3377
                if (curstream && 
 
3378
                    curstream->codec->codec_type == CODEC_TYPE_VIDEO)
 
3379
                {
 
3380
                    mpeg_seq_end_seen = false;
 
3381
                    decodeStillFrame = false;
 
3382
                    ringBuffer->DVD()->InStillFrame(false);
 
3383
                }
3379
3384
            }
3380
3385
 
3381
3386
            if (waitingForChange && pkt->pos >= readAdjust)
3641
3646
                         (curstream->codec->codec_id == CODEC_ID_DTS));
3642
3647
                    bool using_passthru = do_ac3_passthru || do_dts_passthru;
3643
3648
 
 
3649
                    /// XXX HACK: set sample format to signed 16 bit
 
3650
                    if (curstream->codec->codec_id == CODEC_ID_TRUEHD)
 
3651
                        curstream->codec->sample_fmt = SAMPLE_FMT_S16;
 
3652
 
3644
3653
                    // detect channels on streams that need
3645
3654
                    // to be decoded before we can know this
3646
3655
                    bool already_decoded = false;