[mythtv] Video Output patch (incl. Windows & OSX) v11

[Ian Dall]

Daniel Kristjansson writes:
 > This is an update on the Xv/XvMC patch.
 > The patch is here:
 >    http://www.mrl.nyu.edu/~danielk/mythtv/xv-xvmc-merge-v12.patch.bz2

This patch seems to introduce a build error. osdxvmc.h should be in HEADERS
and the .cpp should be in SOURCES:

--- libs/libmythtv/libmythtv.pro	10 Apr 2005 00:47:09 -0000	1.88
+++ libs/libmythtv/libmythtv.pro	20 Apr 2005 02:09:58 -0000
@@ -57,6 +57,7 @@
 HEADERS += dbcheck.h udpnotify.h channeleditor.h channelsettings.h
 HEADERS += osdlistbtntype.h blend.h datadirect.h sr_dialog.h
 HEADERS += sr_items.h sr_root.h recordingtypes.h jobqueue.h dtvrecorder.h
+HEADERS += videobuffers.h
 
 SOURCES += commercial_skip.cpp frequencies.c guidegrid.cpp #infodialog.cpp 
 SOURCES += infostructs.cpp jitterometer.cpp minilzo.cpp NuppelVideoPlayer.cpp 
@@ -70,6 +71,7 @@
 SOURCES += osdsurface.cpp osdlistbtntype.cpp blend.c datadirect.cpp
 SOURCES += sr_dialog.cpp sr_root.cpp sr_items.cpp decoderbase.cpp
 SOURCES += recordingtypes.cpp jobqueue.cpp dtvrecorder.cpp
+SOURCES += videobuffers.cpp
 
 
 unix {
@@ -99,16 +101,12 @@
 }
 
 using_x11 {
+    using_xvmcw:DEFINES += USING_XVMCW
     using_xv {
-        SOURCES += videoout_xv.cpp
-        HEADERS += videoout_xv.h
+        SOURCES += videoout_xv.cpp XvMCSurfaceTypes.cpp osdxvmc.h
+        HEADERS += videoout_xv.h XvMCSurfaceTypes.h osdxvmc.cpp
         DEFINES += USING_XV
     }
-
-    using_xvmc {
-        SOURCES += videoout_xvmc.cpp XvMCSurfaceTypes.cpp
-        HEADERS += videoout_xvmc.h XvMCSurfaceTypes.h
-    }
 }
 
 using_ivtv {