-
Michael Niedermayer authored
* commit '4d388c0c': 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>
0a5ca63c