[FFmpeg-cvslog] Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Sep 28 00:02:15 2017 -0300| [d7458ca8d7c8ae65fca0e4641cdc77c6dc327808] | committer: James Almer

Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'

* commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c':
  lavc: Add device context field to AVCodecContext

This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50

Merged-by: James Almer <jamrial at gmail.com>

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