Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'
authorMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 21:07:57 +0000 (22:07 +0100)
committerMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 21:07:57 +0000 (22:07 +0100)
commitff821fdfced0de05e1e62c7fec2635ffc607f383
treeb3ee5ac8938408d5511234fe658e74e48c187822
parentc0f2a8eac172ce720a513abe1706a026236c0579
parent4ab61cd983b539749bd621ea271624ddb5196a8e
Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'

* commit '4ab61cd983b539749bd621ea271624ddb5196a8e':
  qsv{enc,dec}: extend the internal frame allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/qsv.c
libavcodec/qsv_internal.h
libavcodec/qsvdec.c
libavcodec/qsvenc.c