]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'eccfb9778ae939764d17457f34338d140832d9e1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:38:45 +0000 (22:38 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:38:45 +0000 (22:38 +0100)
* commit 'eccfb9778ae939764d17457f34338d140832d9e1':
  qsvdec_hevc: add the UID of the HEVC HW decoder plugin

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge