Merge commit '2b1324bd167553f49736e4eaa94f96da9982925e'
authorJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:39:58 +0000 (13:39 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 8 Nov 2017 16:39:58 +0000 (13:39 -0300)
* commit '2b1324bd167553f49736e4eaa94f96da9982925e':
  lavf: allow avformat_close_input() with NULL
  dxva: DXVA2_ModeHEVC_VLD_Main10 does not support Main
  caf: add an Opus tag
  hevc: Make sure to update the current frame transfer characteristic

This commit is a noop, see
dc9735eb67ca696d926922735a9bf01776d5c328
b4093e60c51af493a6dad7819264ef769736227f
5a3b602acda68fe5ca09082dc753179450a97a13
c64da19bbc1d3b405703ef3b705dba39a450504f
36cd017acd9cac0e6695124c052a59fb1fc13145

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

Trivial merge