[FFmpeg-cvslog] Merge commit '816e5b997028c8215c804b1e58b2388592ed612b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  2 05:40:30 2014 +0100| [d9bb7fc3cb18fbce3a0ddc18541d5537b2e8d9a4] | committer: Michael Niedermayer

Merge commit '816e5b997028c8215c804b1e58b2388592ed612b'

* commit '816e5b997028c8215c804b1e58b2388592ed612b':
  hevc: Reject impossible slice segment

Conflicts:
	libavcodec/hevc.c

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

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