diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-24 23:49:30 +0200 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-10 00:54:34 +0200 |
commit | b0d9042f9dbebde7311ca6ee729753ecb60e6f60 (patch) | |
tree | f0b4755e5fafd71cb8748b39bd3e0be9a4c73400 /libavformat/nistspheredec.c | |
parent | c83569e5f15199ef251dbd6b6d3cb4bdc5da7f8d (diff) | |
download | ffmpeg-b0d9042f9dbebde7311ca6ee729753ecb60e6f60.tar.gz |
avcodec/ffv1: seperate slice_count from max_slice_count
Fix segfault with too large slice_count
Fixes Ticket4879
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit aa6c43f3fdec8a7518534b9dab20c9eb4be11568)
Conflicts:
libavcodec/ffv1enc.c
libavcodec/ffv1.c
Diffstat (limited to 'libavformat/nistspheredec.c')
0 files changed, 0 insertions, 0 deletions