diff options
| author | Arne Morten Kvarving <spiff@xbmc.org> | 2013-04-06 01:54:51 -0700 |
|---|---|---|
| committer | Arne Morten Kvarving <spiff@xbmc.org> | 2013-04-06 01:54:51 -0700 |
| commit | 53a3ddbec12509d9a7cc381ba85aae1ff600ee2b (patch) | |
| tree | a8f9b5b51e63ffe67573d893cf3512200e062aa4 | |
| parent | 24e879aae97a8001fa470936e79c436f72e54d96 (diff) | |
| parent | 6d637d4801095acfe5b6a7e56f446aa2e4602bfa (diff) | |
Merge pull request #1954 from anuj-m/master
[vaapi] Fix crash while playing mpeg2 files
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 2302772f8f..aa7de02e77 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -105,6 +105,11 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx if(*cur == PIX_FMT_VAAPI_VLD && g_guiSettings.GetBool("videoplayer.usevaapi") && (avctx->codec_id != CODEC_ID_MPEG4 || g_advancedSettings.m_videoAllowMpeg4VAAPI)) { + if (ctx->GetHardware() != NULL) + { + ctx->SetHardware(NULL); + } + VAAPI::CDecoder* dec = new VAAPI::CDecoder(); if(dec->Open(avctx, *cur)) { |