Merge commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 15:11:17 +0000 (17:11 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 15:12:00 +0000 (17:12 +0200)
commitda10aaf23844becb16a5925d2fb95e14eab16b7e
tree943896002a30ce776515e4d2693062e70f2f008c
parent5be07d0206916bf9119e5f4255c528aac1621406
parent1b9a8e5f1d007ea19f04032490d681becd0d4e6a
Merge commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a'

* commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a':
  dxva2_hevc: unbreak compilation after recent sps/pps changes

See: 1aab5d8ab1e27449a2d58d6f001bb34784f402bf
Merged-by: Michael Niedermayer <michael@niedermayer.cc>