Merge commit '17e9d52c'

* commit '17e9d52c':
  hevc_ps: remove a write-only variable

Conflicts:
	libavcodec/hevc_ps.c

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