[FFmpeg-cvslog] Merge commit '8dfba25ce89b62c80ba83e2116d549176c376144'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Apr 26 17:31:22 2017 +0200| [8c6f18e4449ad2bb3c30621b9dca45acc86332cb] | committer: Clément Bœsch

Merge commit '8dfba25ce89b62c80ba83e2116d549176c376144'

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

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