Merge commit '4d388c0cd05dd4de545e8ea333ab4de7d67ad12d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 09:21:37 +0000 (10:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 09:45:53 +0000 (10:45 +0100)
commit0a5ca63c24b8a07f94611637ba29e41b8b47ce24
tree45db4efd1df22ecced7c1199fe03b275c4577943
parenta212d66c2acf534925837bf338e167ec7ecefaa1
parent4d388c0cd05dd4de545e8ea333ab4de7d67ad12d
Merge commit '4d388c0cd05dd4de545e8ea333ab4de7d67ad12d'

* commit '4d388c0cd05dd4de545e8ea333ab4de7d67ad12d':
  h264_refs: make sure not to write over the bounds of the default ref list

Conflicts:
libavcodec/h264_refs.c

This condition should be impossible and was checked for by asserts.
the asserts are moved up in this merge to gurantee that no out of array
access can happen even if the state is "impossible".
Also if such impossible states could somehow be created, that should
be dealt with and not silently ignored.

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