Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:03:00 +0000 (14:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:03:26 +0000 (14:03 +0100)
commit2b5fa0e0be1195926e5e83302a1680c3c28e055a
tree2727d0126d551e007881af6f8b0b63e8fa2afc5d
parentf35c4f4a17a47380e106ce5e14aed957e3bce8f8
parent4b95e95dbae58c9b60891284bf8b5bbd83e5293a
Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a'

* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
  hevc: store the short term rps flag and size in the context

See: 06894f1a04dda384ab3632b2342f0f97ec9ebed9
Merged-by: Michael Niedermayer <michaelni@gmx.at>