]> git.sesse.net Git - ffmpeg/commit
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)
commit220e77391552a61d515a1d8c2b17afd876958613
treec368e03a35fe4dfd83767e6300dcb6c1fa5b4326
parent1bc6cdf2fcbd3caea7b78d0a617c6e338606d756
parentce320cf1c4daab3e2e3726ed7d2e879d10f7b991
Merge commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991'

* commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991':
  qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init

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