Merge commit 'd30719e62de68975cbc7ffd318df03a183037563'
authorJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:01:00 +0000 (00:01 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:01:00 +0000 (00:01 -0300)
commitbfb2e20737cb310bd352b46a286a73e7a689e0d4
treecd4443cf0548cb57f39ba30352efab5a7c89d787
parent4fbb56acbe711ab4c01c0207cc9dabc27f7c6477
parentd30719e62de68975cbc7ffd318df03a183037563
Merge commit 'd30719e62de68975cbc7ffd318df03a183037563'

* commit 'd30719e62de68975cbc7ffd318df03a183037563':
  hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size pool

This commit is a noop, see 2b8151c80690a71db2cf8009855b4ae1a6abdd4c

Merged-by: James Almer <jamrial@gmail.com>