Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 09:42:05 +0000 (11:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 09:43:33 +0000 (11:43 +0200)
* commit '17e9d52c8c93f47721ff481b8867922f4b4bd663':
  hevc_ps: remove a write-only variable

Conflicts:
libavcodec/hevc_ps.c

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

Trivial merge