diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:14 +0100 |
| commit | a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 (patch) | |
| tree | 795c7ce7355345c1163ef0bf37291e1840b46b85 /libavcodec/h264_slice.c | |
| parent | 5c8280c3075dd54f26752c3a1185647578421703 (diff) | |
| download | ffmpeg-a67f8ae9a2c8529bf6a635e8ca4e3483592708b1.tar.gz | |
h264: move mvd_table into the per-slice context
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a32882eeec..d883f6b0e8 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -367,6 +367,8 @@ static void clone_tables(H264Context *dst, H264SliceContext *sl, H264Context *src, int i) { sl->intra4x4_pred_mode = src->intra4x4_pred_mode + i * 8 * 2 * src->mb_stride; + sl->mvd_table[0] = src->mvd_table[0] + i * 8 * 2 * src->mb_stride; + sl->mvd_table[1] = src->mvd_table[1] + i * 8 * 2 * src->mb_stride; dst->non_zero_count = src->non_zero_count; dst->slice_table = src->slice_table; @@ -374,8 +376,6 @@ static void clone_tables(H264Context *dst, H264SliceContext *sl, dst->mb2b_xy = src->mb2b_xy; dst->mb2br_xy = src->mb2br_xy; dst->chroma_pred_mode_table = src->chroma_pred_mode_table; - dst->mvd_table[0] = src->mvd_table[0] + i * 8 * 2 * src->mb_stride; - dst->mvd_table[1] = src->mvd_table[1] + i * 8 * 2 * src->mb_stride; dst->direct_table = src->direct_table; dst->list_counts = src->list_counts; dst->DPB = src->DPB; |