[FFmpeg-cvslog] Merge commit '84f225684cd389747907381122c073aa1c8b6bf1'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 14:46:14 2017 -0300| [e2f6e1c4a825cdd95dafc349dcfd4bc05da88fd3] | committer: James Almer

Merge commit '84f225684cd389747907381122c073aa1c8b6bf1'

* commit '84f225684cd389747907381122c073aa1c8b6bf1':
  pthread_frame: properly propagate the hw frame context across frame threads

This commit is a noop, see 98f89d615b6490a5b93930c7bfa74c427dedf04e.
Merged-by: James Almer <jamrial at gmail.com>

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