[FFmpeg-cvslog] Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 19 17:59:47 2013 +0100| [8983dea426e34ced61d518f440be21d0f49ddb6d] | committer: Michael Niedermayer

Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'

* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
  hevc_sei: drop unused parameter

Conflicts:
	libavcodec/hevc_sei.c

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

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