← 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, Mario Limonciello, John Baab
  • Date: 2009-09-29 01:33:23 UTC
  • mfrom: (1.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20090929013323-6pvn8encm757zbxw
Tags: 0.22.0~trunk22101-0ubuntu1
[ Mario Limonciello ]
* New upstream checkout (r22101)
* Try to guard and make sure that ~mythtv is read from /etc/passwd 
  rather than assuming it's /home/mythtv.

[ John Baab ]
* debian/mythtv-common.postinst:
  - Added symlink for /home/mythtv/.mythtv/config.xml

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythtv/avformatdecoder.cpp
128
128
            break;
129
129
        default:
130
130
            return;
131
 
    }       
 
131
    }
132
132
 
133
133
    if ((print_verbose_messages & verbose_level) != verbose_level)
134
134
        return;
3418
3418
 
3419
3419
            bool inDVDStill = ringBuffer->DVD()->InStillFrame();
3420
3420
 
3421
 
            VERBOSE(VB_PLAYBACK+VB_EXTRA, 
 
3421
            VERBOSE(VB_PLAYBACK+VB_EXTRA,
3422
3422
                QString("DVD Playback Debugging: mpeg seq end %1 "
3423
3423
                " inDVDStill %2 decodeStillFrame %3")
3424
3424
                .arg(mpeg_seq_end_seen).arg(inDVDStill).arg(decodeStillFrame));
3461
3461
                            .arg(video_width).arg(current_width)
3462
3462
                            .arg(dvd_video_codec_changed));
3463
3463
                    av_free_packet(pkt);
3464
 
                    CloseCodecs();
3465
 
                    ScanStreams(false);
3466
 
                    allowedquit = true;
3467
 
                    dvd_video_codec_changed = false;
 
3464
                    if (current_width > 0) {
 
3465
                        CloseCodecs();
 
3466
                        ScanStreams(false);
 
3467
                        allowedquit = true;
 
3468
                        dvd_video_codec_changed = false;
 
3469
                    }
3468
3470
                    continue;
3469
3471
                }
3470
3472
            }