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)
* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
  hevc: store the short term rps flag and size in the context

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

Trivial merge