Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:28:55 +0000 (16:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 15:28:55 +0000 (16:28 +0100)
commita60abb1ee01ee065fc1ab2a784fefbd5d3c94917
tree794a40a9593f67c0e098ca1af0ff81c7791e0552
parent98dcbb47fa5f51b8ebdf312bcee18b4b9900e7b2
parentbfd26b7ce6efea594f2b99441d900419df3af638
Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'

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

Conflicts:
libavcodec/h264_ps.c

See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264_ps.c