Ticket #1122: 1122-fix-v4.patch

File 1122-fix-v4.patch, 2.0 KB (added by danielk, 15 years ago)

Update of v4 to apply to current SVN

  • libs/libmythtv/NuppelVideoPlayer.cpp

     
    367367
    368368bool NuppelVideoPlayer::InitVideo(void)
    369369{
     370    VERBOSE(VB_RECORD, "InitVideo()");
    370371    InitFilters();
    371372    if (using_null_videoout)
    372373    {
     
    447448
    448449void NuppelVideoPlayer::ReinitVideo(void)
    449450{
     451    VERBOSE(VB_RECORD, "ReinitVideo()");
    450452    InitFilters();
    451453
    452454    vidExitLock.lock();
  • libs/libmythtv/videoout_xv.cpp

     
    851851 */
    852852bool VideoOutputXv::InitXvMC(MythCodecID mcodecid)
    853853{
     854    VERBOSE(VB_IMPORTANT, "InitXvMC() -- begin");
    854855    (void)mcodecid;
    855856#ifdef USING_XVMC
    856857    xv_port = GrabSuitableXvPort(XJ_disp, XJ_root, mcodecid,
     
    900901        xv_port = -1;
    901902    }
    902903
     904    VERBOSE(VB_IMPORTANT, "InitXvMC() -- end ok("<<ok<<")");
    903905    return ok;
    904906#else // USING_XVMC
    905907    return false;
     
    916918 */
    917919bool VideoOutputXv::InitXVideo()
    918920{
     921    VERBOSE(VB_IMPORTANT, "InitXVideo() -- begin");
    919922    xv_port = GrabSuitableXvPort(XJ_disp, XJ_root, kCodec_MPEG2,
    920923                                 XJ_width, XJ_height);
    921924    if (xv_port == -1)
     
    10011004    else
    10021005        video_output_subtype = XVideo;
    10031006   
     1007    VERBOSE(VB_IMPORTANT, "InitXVideo() -- end ok("<<ok<<")");
    10041008    return ok;
    10051009}
    10061010
     
    10811085    (void)stream_type, (void)xvmc_chroma, (void)test_surface;
    10821086
    10831087#ifdef USING_XVMC
     1088    VERBOSE(VB_IMPORTANT, "GetBestSupportedCodec() -- begin");
    10841089    Display *disp;
    10851090    X11S(disp = XOpenDisplay(NULL));
    10861091
     
    11611166        ret = (MythCodecID)(kCodec_MPEG1 + (stream_type-1));
    11621167    }
    11631168
     1169    VERBOSE(VB_IMPORTANT, "GetBestSupportedCodec() -- end");
    11641170    return ret;
    11651171#else // if !USING_XVMC
    11661172    return (MythCodecID)(kCodec_MPEG1 + (stream_type-1));