diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:16:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 03:16:54 +0200 |
| commit | 6e835eb2dd5204f04822558474c16f41583e0ed5 (patch) | |
| tree | 45eaf62cc7e641419cf30b597dfc68bf3d3e6785 | |
| parent | 7bce99216f744f76bf9e8cb449cd11a5e301ef68 (diff) | |
| parent | a529f6648ed450f7e846a0e704a0a3260aaa4b62 (diff) | |
| download | ffmpeg-6e835eb2dd5204f04822558474c16f41583e0ed5.tar.gz | |
Merge commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62' into release/2.4
* commit 'a529f6648ed450f7e846a0e704a0a3260aaa4b62':
hevc: zero the correct variables on invalid crop parameters
Conflicts:
libavcodec/hevc_ps.c
See: 7bce99216f744f76bf9e8cb449cd11a5e301ef68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions