Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:46:01 +0000 (16:46 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:46:25 +0000 (16:46 +0200)
commitfbdbe7a5d262db06ae44a7bd606d18954241c040
tree782d065f8394f3c41ad0285b2d4ef33b4b682ac7
parente1b5a2e46ef0734d149c2cbbc8a5a82be100c617
parentecee1148af4989e1f9e16f0cdc9f98ad2045538c
Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'

* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
  qsvenc_hevc: use the correct HW plugin UID

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsvenc_hevc.c