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)
commite3f9c5826ace91bf8d933bd924df2eb4081da6c6
treea92f81e032bb13c19af1ccf495af7463e3714495
parent855305fac2399c0d484f51be4e6bb67e520835e0
parente8bbacbf529049c401bfeea70d5e0b5d2c8b6de6
Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'

* commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6':
  hwcontext_qsv: support frame mapping

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