[FFmpeg-cvslog] Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 15:42:51 2014 +0100| [a69dd1163b1a91978e596af551c9561d121aeedf] | committer: Michael Niedermayer

Merge commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac'

* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
  hevc: Bound check cu_qp_delta

Conflicts:
	libavcodec/hevc.c

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

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