Ticket #6660: colorkey_v4.diff
File colorkey_v4.diff, 1.2 KB (added by , 15 years ago) |
---|
-
libs/libmythtv/videoout_xv.cpp
1085 1085 { 1086 1086 // Deal with the nVidia 6xxx & 7xxx cards which do 1087 1087 // not support chromakeying with the latest drivers 1088 if ( xv_colorkey|| !chroma_osd)1088 if (((xv_colorkey != (int)XJ_letterbox_colour) && chroma_osd) || !chroma_osd) 1089 1089 return true; 1090 1090 1091 1091 VERBOSE(VB_IMPORTANT, LOC + "Ack! Disabling ChromaKey OSD" … … 1331 1331 // the same color as the MythTV letterboxing (currently Black). 1332 1332 // This avoids avoid bob-deint actually bobbing the borders of 1333 1333 // the video up and down.. 1334 int letterbox_color = 0;1334 int letterbox_color = XJ_letterbox_colour; 1335 1335 static const char *attr_chroma = "XV_COLORKEY"; 1336 1336 if (!xv_is_attrib_supported(disp, xv_port, attr_chroma, &xv_colorkey)) 1337 1337 { … … 1795 1795 (void) subtype; 1796 1796 DiscardFrames(true); 1797 1797 1798 if (chroma_osd) 1799 { 1800 delete chroma_osd; 1801 chroma_osd = NULL; 1802 } 1803 1798 1804 Display *d = disp->GetDisplay(); 1799 1805 #ifdef USING_XVMC 1800 1806 // XvMC buffers