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 /libavcodec/ffv1.h | |
| 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 'libavcodec/ffv1.h')
| -rw-r--r-- | libavcodec/ffv1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 5081397f54..cc354c385e 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -117,6 +117,7 @@ typedef struct FFV1Context { struct FFV1Context *slice_context[MAX_SLICES]; int slice_count; + int max_slice_count; int num_v_slices; int num_h_slices; int slice_width; |