[FFmpeg-cvslog] Merge commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 15:15:19 2014 +0200| [9081b4ddddeea2c01036115a2037fb75f279be2a] | committer: Michael Niedermayer

Merge commit '7f604a048e9b6128cdf9ce7e95f21d1a9822ba39' into release/1.1

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

Conflicts:
	libavcodec/h264_ps.c

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

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