Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'
authorMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 21:06:03 +0000 (22:06 +0100)
committerMark Thompson <sw@jkqxz.net>
Thu, 30 Mar 2017 21:06:03 +0000 (22:06 +0100)
* commit '00aeedd84105a17f414185bd33ecadebeddb3a27':
  qsv{dec,enc}: use a struct as a memory id with internal memory 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