]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e999a4e 99cf943)
Merge commit '99cf943339a2e5171863c48cd1a73dd43dc243e1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:06:42 +0000 (15:06 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:06:42 +0000 (15:06 +0100)
* commit '99cf943339a2e5171863c48cd1a73dd43dc243e1':
  d3d11va: don't keep the context lock while waiting for a frame

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.