[mythtv-commits] mythtv commit: 6fe4c4a by Jean-Yves Avenard (jyavenard)

[MythTV]

      Author:  Jean-Yves Avenard <jyavenard at mythtv.org>
 Change Date:  2010-12-07T01:46:35-08:00
   Push Date:  2010/12/07 21:09:23 -0800
  Repository:  mythtv
      Branch:  temp/newaudiosetup
New Revision:  6fe4c4ac6d32e7ab1c99467b3568b789c965d866
   Changeset:  https://github.com/MythTV/mythtv/commit/6fe4c4a

Log:

Merge with master

Added:

   mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp
   mythplugins/mythbrowser/mythbrowser/mythflashplayer.h
   mythtv/docs/.gitignore

Removed:

   myththemes/.gitignore
   mythtv/libs/libmythtv/XvMCSurfaceTypes.cpp
   mythtv/libs/libmythtv/XvMCSurfaceTypes.h
   mythtv/libs/libmythtv/osdxvmc.cpp
   mythtv/libs/libmythtv/osdxvmc.h
   mythtv/libs/libmythtv/util-xvmc.cpp
   mythtv/libs/libmythtv/util-xvmc.h

Modified:

   .gitignore
   mythplugins/mytharchive/mythburn/scripts/mythburn.py
   mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
   mythplugins/mythbrowser/mythbrowser/main.cpp
   mythplugins/mythbrowser/mythbrowser/mythbrowser.pro
   mythplugins/mythgallery/mythgallery/galleryutil.cpp
   mythplugins/mythmusic/mythmusic/cdrip.cpp
   mythplugins/mythmusic/mythmusic/cdrip.h
   mythplugins/mythmusic/mythmusic/smartplaylist.cpp
   mythplugins/mythweather/mythweather/sourceManager.cpp
   mythtv/Makefile
   mythtv/libs/libmyth/audio/audiooutputsettings.cpp
   mythtv/libs/libmythbluray/bluray.c
   mythtv/libs/libmythbluray/bluray.h
   mythtv/libs/libmythdb/mythversion.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/cardutil.cpp
   mythtv/libs/libmythtv/cardutil.h
   mythtv/libs/libmythtv/datadirect.cpp
   mythtv/libs/libmythtv/fileringbuffer.cpp
   mythtv/libs/libmythtv/frame.h
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mythcodecid.cpp
   mythtv/libs/libmythtv/mythcodecid.h
   mythtv/libs/libmythtv/osd.h
   mythtv/libs/libmythtv/playgroup.cpp
   mythtv/libs/libmythtv/playgroup.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/videobuffers.cpp
   mythtv/libs/libmythtv/videobuffers.h
   mythtv/libs/libmythtv/videodisplayprofile.cpp
   mythtv/libs/libmythtv/videoout_vdpau.cpp
   mythtv/libs/libmythtv/videoout_xv.cpp
   mythtv/libs/libmythtv/videoout_xv.h
   mythtv/libs/libmythtv/videooutbase.cpp
   mythtv/libs/libmythtv/videoouttypes.h
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.h
   mythtv/libs/libmythupnp/httprequest.cpp
   mythtv/programs/mythfilldatabase/channeldata.cpp
   mythtv/programs/mythfrontend/proglist.cpp
   mythtv/programs/mythfrontend/proglist.h
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/themes/MythCenter-wide/status-ui.xml
   mythtv/version.sh