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 22:53:10 +0200 |
| commit | fd7e170507f4656a966ddd2a57db230779f96ba7 (patch) | |
| tree | 2e5d9ce2b3d2eb56ef567363b0673af878d84022 /ffprobe.c | |
| parent | 288f52a64aac934750b87117e8e397c838036570 (diff) | |
| download | ffmpeg-fd7e170507f4656a966ddd2a57db230779f96ba7.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
(cherry picked from commit ef6d6f89067d17d1187fc1d82b418c63b88cbba6)
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions