aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRainer Hochecker <fernetmenta@online.de>2018-08-24 14:03:01 +0200
committerGitHub <noreply@github.com>2018-08-24 14:03:01 +0200
commit6854871e72d59733f2d935a2cd93aa6a47e2a294 (patch)
tree8487904f1140d0c4433ebc86a5676494ad9435d8
parent964e573b53f4d13784d53c7b3a9709c8059e7142 (diff)
parente9495d192b41148242b86c4afdc5195c0b206895 (diff)
Merge pull request #14346 from FernetMenta/decoder
VideoPlayer: VDPAU - whitelist AV_PIX_FMT_YUVJ420P
-rw-r--r--xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp
index 893d276c05..ff55df5642 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp
@@ -490,7 +490,8 @@ bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum A
{
// this could be done better by querying actual hw capabilities
// but since vdpau will be dropped anyway in v19, this should do
- if (avctx->sw_pix_fmt != AV_PIX_FMT_YUV420P)
+ if (avctx->sw_pix_fmt != AV_PIX_FMT_YUV420P &&
+ avctx->sw_pix_fmt != AV_PIX_FMT_YUVJ420P)
return false;
// check if user wants to decode this format with VDPAU