[mythtv-commits] mythtv commit: r14718 by skamithi

[mythtv at cvs.mythtv.org]

      Author: skamithi
        Date: 2007-10-26 04:02:14 +0000 (Fri, 26 Oct 2007)
New Revision: 14718
   Changeset: http://cvs.mythtv.org/trac/changeset/14718

Modified:

   branches/mythtv-vid/libs/libmythtv/NuppelVideoPlayer.cpp
   branches/mythtv-vid/libs/libmythtv/tv_play.cpp
   branches/mythtv-vid/libs/libmythtv/videoout_xv.cpp
   branches/mythtv-vid/libs/libmythtv/videooutbase.cpp
   branches/mythtv-vid/libs/libmythtv/videooutbase.h

Log:

Refs #2287. fix some merge problems found after the last update from trunk.