Skip to content
Commit 7ee2013e authored by Martijn Kaijser's avatar Martijn Kaijser Committed by Jonathan Marshall
Browse files

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
parent 5b004223
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment