[FFmpeg-cvslog] Merge commit 'd4a91e65343be5d79a4afa61c791191e1b57499a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Apr 26 17:32:40 2017 +0200| [540b8760e84cda1ecab807c808e61a4cfaa1783c] | committer: Clément Bœsch

Merge commit 'd4a91e65343be5d79a4afa61c791191e1b57499a'

* 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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=540b8760e84cda1ecab807c808e61a4cfaa1783c
---