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)
* commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6':
  qsv: Join the derived session to the parent

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

Simple merge
Simple merge