diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-24 23:49:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-08 13:15:42 +0200 |
| commit | d4b1fe72c24c2d6ed3fbd5bdd104a3f9d07b65ba (patch) | |
| tree | be191df918aa5951163c993ac7fb24d32b6c3875 /libavcodec/ffv1.h | |
| parent | a8d0dcbafadef11156833f1a335f3473c08727aa (diff) | |
| download | ffmpeg-d4b1fe72c24c2d6ed3fbd5bdd104a3f9d07b65ba.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)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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 9526b1634f..b68ed2c4c1 100644 --- a/libavcodec/ffv1.h +++ b/libavcodec/ffv1.h @@ -118,6 +118,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; |