diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 12:08:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 12:09:03 +0100 |
| commit | 665e0c10a63d31dd6c7b1fba14db074625d54614 (patch) | |
| tree | bf528757579d4ac171369b9466705719632415e4 /libavcodec/aaccoder.c | |
| parent | e4588e376a63e50a98c4ae0658cf45a9c4e6c556 (diff) | |
| parent | d8a45d2d49f54fde042b195f9d5859251252493d (diff) | |
| download | ffmpeg-665e0c10a63d31dd6c7b1fba14db074625d54614.tar.gz | |
Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'
* commit 'd8a45d2d49f54fde042b195f9d5859251252493d':
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/aaccoder.c')
0 files changed, 0 insertions, 0 deletions