Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 22:07:36 +0000 (23:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 22:13:33 +0000 (23:13 +0100)
commita52fbe511948b29ddb042e5021c0eb805b8cae6f
tree08f9807a322cd2425d9dd1b8988c73d7d3c95018
parent2510e820c43c08d1c2ddf5291054c6f93afc1369
parent8b2e5e42bb9d6a59ede5af2e6df4aaf7750d1195
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: check that an IDR NAL only contains I slices

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