[FFmpeg-cvslog] Merge commit '0d999333f96a34903448579bf13a3209deaee9da'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 15:38:29 2014 +0100| [58f437c3f6672f2a42d7e4bee79ad91e9fe4bdcc] | committer: Michael Niedermayer

Merge commit '0d999333f96a34903448579bf13a3209deaee9da'

* commit '0d999333f96a34903448579bf13a3209deaee9da':
  hevc: Bound check slice_qp

Conflicts:
	libavcodec/hevc.c

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

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