diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-07-29 21:50:08 +0200 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@xbmc.org> | 2014-08-02 15:58:58 +1200 |
| commit | 7ee2013ebe5ab3ca46bd7eacf1b21d384c0390e3 (patch) | |
| tree | 6c3622e1e9902d267394577c4cba50518e0d75f4 | |
| parent | 5b00422370f94c09ce0f53bd650e55d56b1937ad (diff) | |
Merge pull request #5101 from FernetMenta/ffmpeg-threads
ffmpeg: fix deadlock caused by calling avctx->thread_count after codec_o...
Conflicts:
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 1 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp index bfefc9d899..fd3e249ab9 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp @@ -391,7 +391,6 @@ bool CDecoder::Open(AVCodecContext *avctx, enum PixelFormat fmt, unsigned int su m_hwaccel->display = m_display->get(); avctx->hwaccel_context = m_hwaccel; - avctx->thread_count = 1; avctx->get_buffer = GetBufferS; avctx->reget_buffer = GetBufferS; avctx->release_buffer = RelBufferS; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp index 4bc51808e6..73c4fa4a83 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -589,7 +589,6 @@ bool CDecoder::Open(AVCodecContext* avctx, const enum PixelFormat fmt, unsigned avctx->draw_horiz_band = CDecoder::FFDrawSlice; avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; avctx->hwaccel_context = &m_hwContext; - avctx->thread_count = 1; g_Windowing.Register(this); return true; |