Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:53:50 +0000 (19:53 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:53:50 +0000 (19:53 +0000)
commit1466379059201662c9f5685d51ea316447fbb113
tree52f6e5373da42bd196e2d568723bafd25d2a9c3e
parentdf61e4c2415042de3c79a68b1d59d15ba5f21092
parent8958c5c64d05453204642b55a7b8b44c93023b17
Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'

This commit is a no-op.

* commit '8958c5c64d05453204642b55a7b8b44c93023b17':
  hevc: Track long and short term RPS size for VDPAU

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>