aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/truemotion1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-28 10:21:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-28 10:45:53 +0100
commit0a5ca63c24b8a07f94611637ba29e41b8b47ce24 (patch)
tree45db4efd1df22ecced7c1199fe03b275c4577943 /libavcodec/truemotion1.c
parenta212d66c2acf534925837bf338e167ec7ecefaa1 (diff)
parent4d388c0cd05dd4de545e8ea333ab4de7d67ad12d (diff)
downloadffmpeg-0a5ca63c24b8a07f94611637ba29e41b8b47ce24.tar.gz
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>
Diffstat (limited to 'libavcodec/truemotion1.c')
0 files changed, 0 insertions, 0 deletions