merging trunk

This commit is contained in:
Stephan Raue
2010-04-06 18:25:40 +02:00
6 changed files with 7 additions and 22 deletions

View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29058.tar.bz2
http://sources.openelec.tv/svn/xbmc-theme-Confluence-29060.tar.bz2

View File

@@ -119,7 +119,7 @@ cd -
$XBMC_VDPAU \
$XBMC_VAAPI \
$XBMC_CRYSTALHD \
--disable-internal-ffmpeg \
--disable-external-ffmpeg \
--disable-external-liba52 \
--disable-external-libdts \
--disable-external-libass \

View File

@@ -1 +1 @@
http://sources.openelec.tv/svn/xbmc-29058.tar.bz2
http://sources.openelec.tv/svn/xbmc-29060.tar.bz2

View File

@@ -98,13 +98,8 @@
# tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
REMOTE="mceusb"
# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
RECEIVER="mceusb"
# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
# Space separated list is supported,
# Space separated list is supported,
# e.g. FIRMWARE="iwl3945 iwl5000"
FIRMWARE=""

View File

@@ -86,7 +86,7 @@
VDPAU="yes"
# Use VAAPI video acceleration (needs intel i965 driver and a supported card)
VAAPI="no"
VAAPI="yes"
# Use Broadcom CrystalHD Decoder Card for video acceleration
# (needs Kernelsupport for Broadcom Decoder Card and a supported card)
@@ -98,13 +98,8 @@
# tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
REMOTE="mceusb"
# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
RECEIVER="mceusb"
# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
# Space separated list is supported,
# Space separated list is supported,
# e.g. FIRMWARE="iwl3945 iwl5000"
FIRMWARE="ipw2100 ipw2200 iwl1000 iwl3945 iwl4965 iwl5000 iwl5150 iwl6000"

View File

@@ -98,13 +98,8 @@
# tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
REMOTE="mceusb"
# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
RECEIVER="mceusb"
# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
# Space separated list is supported,
# Space separated list is supported,
# e.g. FIRMWARE="iwl3945 iwl5000"
FIRMWARE="iwl5000"