Ticket #5324: mythtv-vid-28.diff

File mythtv-vid-28.diff, 1.0 KB (added by mark.kendall@…, 4 years ago)

A couple of small QT4 fixes

  • libs/libmythtv/openglvideo.cpp 

    diff -urN -X excl mythtv-vid-27/libs/libmythtv/openglvideo.cpp mythtv-vid-28/libs/libmythtv/openglvideo.cpp
    old new  
    16161616{ 
    16171617    uint ret = kGLMaxFeat - 1; 
    16181618 
    1619     QStringList list = QStringList::split(",", options); 
     1619    QStringList list = options.split(","); 
    16201620 
    16211621    if (list.empty()) 
    16221622        return ret; 

  • libs/libmythtv/videoout_xv.cpp 

    diff -urN -X excl mythtv-vid-27/libs/libmythtv/videoout_xv.cpp mythtv-vid-28/libs/libmythtv/videoout_xv.cpp
    old new  
    122122      xv_colorkey(0),   xv_draw_colorkey(false), 
    123123      xv_chroma(0), 
    124124 
    125       gl_context_lock(true), gl_context(NULL), 
     125      gl_context_lock(QMutex::Recursive), gl_context(NULL), 
    126126      gl_videochain(NULL), gl_pipchain(NULL), 
    127127      gl_osdchain(NULL), 
    128128