Merge commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 18:24:08 +0000 (15:24 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 18:24:08 +0000 (15:24 -0300)
commit1a24d4f020ee52154d2b369d6fc3d5056b5719c8
treecb1833b78332d6f400ed4d960e4b2ca5043b63d0
parent8c82c4d25d363eca035f2c23e8257c1d4c7a20d3
parentea25ccd1b2a980df8d43cc1f86a23e3c094090a6
Merge commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6'

* commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6':
  qsv: Join the derived session to the parent

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