Merge commit 'd4a91e65343be5d79a4afa61c791191e1b57499a'
authorClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 15:32:40 +0000 (17:32 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 26 Apr 2017 15:32:40 +0000 (17:32 +0200)
* commit 'd4a91e65343be5d79a4afa61c791191e1b57499a':
  pthread_frame: do not run hwaccel decoding asynchronously unless it's safe

This commit is a noop, see e0cd598bc4684654d63942e9ff4872c0b48a7dc2

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

Trivial merge