Merge commit 'f62bb216ac4cfbbff16108c6bac35a0282532972'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:36:18 +0000 (22:36 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:36:18 +0000 (22:36 +0100)
commit3aa7b0a27326bd312ef790d9149f6b5efff97311
treef978b87b50d691099c7e850a45cb291ac45b9ddc
parent1f8e1c209db2ec098edd7880a4ac88864615d674
parentf62bb216ac4cfbbff16108c6bac35a0282532972
Merge commit 'f62bb216ac4cfbbff16108c6bac35a0282532972'

* commit 'f62bb216ac4cfbbff16108c6bac35a0282532972':
  hwcontext_vaapi: allow transfers to/from any size of sw frame

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavutil/hwcontext_vaapi.c