[FFmpeg-cvslog] Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  3 01:39:49 2014 +0200| [1e83191d5c830a836bcd03d520272ef711503ac9] | committer: Michael Niedermayer

Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10

* commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

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

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