projects
/
vuplus_xbmc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
7ee2013
)
Merge pull request #5101 from FernetMenta/ffmpeg-threads
author
Martijn Kaijser
<machine.sanctum@gmail.com>
Tue, 29 Jul 2014 19:50:08 +0000
(21:50 +0200)
committer
Jonathan 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