Merge commit '8dfba25ce89b62c80ba83e2116d549176c376144'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 15:31:22 +0000 (17:31 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 15:31:22 +0000 (17:31 +0200)
* commit '8dfba25ce89b62c80ba83e2116d549176c376144':
  pthread_frame: ensure the threads don't run simultaneously with hwaccel

This commit is a noop, see 14bb15bfd56d6e907fabe4620206c1ee152b7a20

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge