Merge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:39:18 +0000 (10:39 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:39:18 +0000 (10:39 +0200)
commit7b1929f173e9f41d8a5d370a2db0dcf004d623fa
tree66491c83a412fafb161cbe74778a6cdc7ff4980e
parent31fc675b1cb5cdd02d47faea90935764d7396757
parentd08e02d929ff8be5f56bb1da0e439bf1ae557552
Merge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'

* commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552':
  vaapi_h265: Fix build failure with old libva without 10-bit surfaces

This commit is a noop, see b9514756ba2b4f764fb86500a8172a57acb58403

Merged-by: Clément Bœsch <cboesch@gopro.com>