Merge commit 'c4033cd4eb921a9cc8deb513efc6d6a6ba3b2163' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:39:49 +0000 (01:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Jun 2014 23:39:49 +0000 (01:39 +0200)
commit1e83191d5c830a836bcd03d520272ef711503ac9
tree4db2409137933ec7525126005044832fa1d0550f
parent69db5f2779f84c8070e505cf2a26a3d46728a6db
parentc4033cd4eb921a9cc8deb513efc6d6a6ba3b2163
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@gmx.at>
libavcodec/h264.c
libavcodec/h264_ps.c