summaryrefslogtreecommitdiff
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-05-06 11:12:55 +0200
committerAnton Khirnov <anton@khirnov.net>2015-06-27 16:43:22 +0200
commite49e0f58e273237f83b4486f3536931ed1943d18 (patch)
tree06c31e9c072fdb1646e30f5c6c136a814586088b /libavcodec/h264.h
parentb56b12cd12f32bf11efff05632600a7619584b98 (diff)
h264: make sure the slices do not overlap during slice threading
Based on a patch by Michael Niedermayer <michaelni@gmx.at>. CC: libav-stable@libav.org Found-by: Kieran Kunhya <kierank@obe.tv>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 12172ac7bc..624a761ded 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -374,6 +374,8 @@ typedef struct H264SliceContext {
int mb_xy;
int resync_mb_x;
int resync_mb_y;
+ // index of the first MB of the next slice
+ int next_slice_idx;
int mb_skip_run;
int is_complex;