Merge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'
authorJames Almer <jamrial@gmail.com>
Tue, 18 Sep 2018 16:28:05 +0000 (13:28 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 18 Sep 2018 16:28:05 +0000 (13:28 -0300)
commitf4cf6ba8c9646814af842a99335c6ee312ded299
tree540abb57a2984b9f0596cc4d75b39c8e96258dd6
parentbd10c1e9a86c9e5f1593f7b178ea060ea965f81c
parenta2041a6522642859ce64af1c618d6fb90a50d4af
Merge commit 'a2041a6522642859ce64af1c618d6fb90a50d4af'

* commit 'a2041a6522642859ce64af1c618d6fb90a50d4af':
  qsvenc: AV_PIX_FMT_QSV path should release frame

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsvenc.c