diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 18:38:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 18:46:11 +0200 |
| commit | f620315fa5b1710e3a47b80ca2cd4597510804ba (patch) | |
| tree | 4fae7d7757418580e20bd8bd675a229798abdd7c /libavcodec/h264.h | |
| parent | cf9051deac498eed70ab68c562b761c55251d270 (diff) | |
| parent | e49e0f58e273237f83b4486f3536931ed1943d18 (diff) | |
| download | ffmpeg-f620315fa5b1710e3a47b80ca2cd4597510804ba.tar.gz | |
Merge commit 'e49e0f58e273237f83b4486f3536931ed1943d18'
* commit 'e49e0f58e273237f83b4486f3536931ed1943d18':
h264: make sure the slices do not overlap during slice threading
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See: 43b434210e597d484aef57c4139c3126d22b7e2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7565e031d5..b1921ef6f6 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -409,7 +409,8 @@ typedef struct H264SliceContext { int mb_xy; int resync_mb_x; int resync_mb_y; - int mb_index_end; + // index of the first MB of the next slice + int next_slice_idx; int mb_skip_run; int is_complex; |