[FFmpeg-cvslog] Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 11 11:42:05 2014 +0200| [f351afb5f9dedc33260b8811223dc39c81bbcec3] | committer: Michael Niedermayer

Merge commit '17e9d52c8c93f47721ff481b8867922f4b4bd663'

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

Conflicts:
	libavcodec/hevc_ps.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f351afb5f9dedc33260b8811223dc39c81bbcec3
---