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)
* commit '4ab61cd983b539749bd621ea271624ddb5196a8e':
  qsv{enc,dec}: extend the internal frame allocator

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

Simple merge
Simple merge
Simple merge
Simple merge