Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:02:15 +0000 (00:02 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:02:15 +0000 (00:02 -0300)
commitd7458ca8d7c8ae65fca0e4641cdc77c6dc327808
tree8a36be04fa47dab0b24e9bb0b5bcf201dad07377
parentd987f9cfe37027758eac54ccac1d9fa040fd5707
parent44f2eda39ff55c69d4d739fb12a42a10b7ce581c
Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'

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

This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50

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