diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 13:25:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-16 13:42:20 +0200 |
commit | e0fcd0294e2f6cc9a3ade974a561be54c9efbc31 (patch) | |
tree | dff29a73a360ba80397e09ec3855746c87e55fde /libavcodec/dsputil_template.c | |
parent | 18e0dd05df136ce049b9827367bbf680a2c12d89 (diff) | |
parent | ac9d159015a88aa2721b271875d18482f713f354 (diff) | |
download | ffmpeg-e0fcd0294e2f6cc9a3ade974a561be54c9efbc31.tar.gz |
Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'
* commit 'ac9d159015a88aa2721b271875d18482f713f354':
proresdec: Properly make sure an index doesn't run past the limit
Conflicts:
libavcodec/proresdec_lgpl.c
See: 30df9789a9745d8e4b1afc10d1a983bfc8816eb9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil_template.c')
0 files changed, 0 insertions, 0 deletions