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:12 +0100 |
| commit | 64c81b2cd0dcf1fe66c381a5d2c707dddcf35a7e (patch) | |
| tree | 29866e0c4f9aaae7d54ffd27a09da81faa53f5fb /libavcodec/h264.h | |
| parent | 7d8154edd594981e7891d57de91f2260f8a62939 (diff) | |
h264: move *_samples_available into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e8e81fe7f7..308ca93197 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -336,6 +336,11 @@ typedef struct H264SliceContext { const uint8_t *left_block; int topleft_partition; + + unsigned int topleft_samples_available; + unsigned int top_samples_available; + unsigned int topright_samples_available; + unsigned int left_samples_available; } H264SliceContext; /** @@ -374,10 +379,6 @@ typedef struct H264Context { int8_t(*intra4x4_pred_mode); H264PredContext hpc; - unsigned int topleft_samples_available; - unsigned int top_samples_available; - unsigned int topright_samples_available; - unsigned int left_samples_available; uint8_t (*top_borders[2])[(16 * 3) * 2]; /** @@ -794,7 +795,8 @@ int ff_h264_check_intra4x4_pred_mode(H264Context *h, H264SliceContext *sl); * Check if the top & left blocks are available if needed & change the * dc mode so it only uses the available blocks. */ -int ff_h264_check_intra_pred_mode(H264Context *h, int mode, int is_chroma); +int ff_h264_check_intra_pred_mode(H264Context *h, H264SliceContext *sl, + int mode, int is_chroma); void ff_h264_hl_decode_mb(H264Context *h, H264SliceContext *sl); int ff_h264_decode_extradata(H264Context *h); |