Merge branch 'openelec-pvr' of git://github.com/Gujs/OpenELEC.tv into openelec-pvr

This commit is contained in:
Stephan Raue 2011-11-03 19:24:25 +01:00
commit ba5fe2a068
22 changed files with 4 additions and 4 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="99c0b41" PKG_VERSION="2884715"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="99c0b41" PKG_VERSION="2884715"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -3,9 +3,9 @@ index d4892b5..697431c 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
@@ -943,6 +943,7 @@ bool CVDPAU::ConfigVDPAU(AVCodecContext* avctx, int ref_frames) @@ -943,6 +943,7 @@ bool CVDPAU::ConfigVDPAU(AVCodecContext* avctx, int ref_frames)
outputSurface = outputSurfaces[surfaceNum];
vdpauConfigured = true; m_vdpauOutputMethod = OUTPUT_NONE;
+ m_binterlacedFrame = false; + m_binterlacedFrame = false;
return true; return true;
} }