diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:26:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:27:07 +0200 |
commit | 8e7eb268758dcb37a4452d02e8908ebf709e21e2 (patch) | |
tree | 7af4d0bcbf0ce2d7a3b32913260faed6957c6243 /libavcodec/rangecoder.c | |
parent | 6e835eb2dd5204f04822558474c16f41583e0ed5 (diff) | |
parent | 9cef65434e5e5ffbd4a856ce7ae9c067dec039b7 (diff) | |
download | ffmpeg-8e7eb268758dcb37a4452d02e8908ebf709e21e2.tar.gz |
Merge commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7' into release/2.4
* commit '9cef65434e5e5ffbd4a856ce7ae9c067dec039b7':
h264_ps: properly check cropping parameters against overflow
Conflicts:
libavcodec/h264_ps.c
See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions