Merge pull request #5101 from FernetMenta/ffmpeg-threads
authorMartijn Kaijser <machine.sanctum@gmail.com>
Tue, 29 Jul 2014 19:50:08 +0000 (21:50 +0200)
committerJonathan Marshall <jmarshall@xbmc.org>
Sat, 2 Aug 2014 03:58:58 +0000 (15:58 +1200)
ffmpeg: fix deadlock caused by calling avctx->thread_count after codec_o...
Conflicts:
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp


No differences found