]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'f62bb216ac4cfbbff16108c6bac35a0282532972':
  hwcontext_vaapi: allow transfers to/from any size of sw frame

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

Simple merge