Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'
authorMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 20:54:46 +0000 (21:54 +0100)
committerMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 20:54:46 +0000 (21:54 +0100)
* commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6':
  hwcontext_qsv: support frame mapping

Merged-by: Mark Thompson <sw@jkqxz.net>
1  2 
libavutil/hwcontext_qsv.c

Simple merge