diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:14:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 14:14:05 +0100 |
| commit | 892a6d00280215ab4c1485c0931912f82318dc63 (patch) | |
| tree | e855ce6f50dd9dcf86d9d3f00b46db8168002494 /libavcodec/h264_mvpred.h | |
| parent | f1436a7f961519f2f149c5eda72af988004f4483 (diff) | |
| parent | 99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a (diff) | |
Merge commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a'
* commit '99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a':
h264: move neighbor_transform_size into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mvpred.h')
| -rw-r--r-- | libavcodec/h264_mvpred.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h index ffc2263f42..bc72fdf9ef 100644 --- a/libavcodec/h264_mvpred.h +++ b/libavcodec/h264_mvpred.h @@ -794,7 +794,7 @@ static void fill_decode_caches(H264Context *h, H264SliceContext *sl, int mb_type } } - h->neighbor_transform_size = !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[LTOP]); + sl->neighbor_transform_size = !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[LTOP]); } /** |