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-09 21:56:33 +0200 |
commit | 3b7d4d8bd63cdcef8916d05c95d1789d2b858570 (patch) | |
tree | 398909d2727a80333fbb407b97c3054861e3a765 /libavformat/concat.c | |
parent | eb681e1fac2cdbdf81d535217934144ead347166 (diff) | |
download | ffmpeg-3b7d4d8bd63cdcef8916d05c95d1789d2b858570.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/concat.c')
0 files changed, 0 insertions, 0 deletions