[FFmpeg-cvslog] Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 11:30:41 2014 +0100| [c192be196839ae28a55b37a01209bc052b8fdbe3] | committer: Michael Niedermayer

Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'

* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
  hevc: remove an unused function parameter

Conflicts:
	libavcodec/hevc.c

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

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