Merge commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:19:51 +0000 (15:19 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:19:51 +0000 (15:19 +0100)
* commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991':
  qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init

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

Simple merge
Simple merge