summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-04-13 17:33:59 +0200
committerAnton Khirnov <anton@khirnov.net>2016-04-24 10:06:25 +0200
commit2e5bde956519ae19cedfa482e199518e495bcaf5 (patch)
tree9743e47edd058c748fea90ada35ca267ba81e6e7 /libavcodec/h264.c
parente3c9041cfe2e6526802255583d27abf9a921863e (diff)
h264: eliminate max_contexts
It is always equal to nb_slice_ctx.
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index efecabf8b6..50dea33ef1 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -808,7 +808,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
int nals_needed = 0; ///< number of NALs that need decoding before the next frame thread starts
int i, ret = 0;
- h->max_contexts = h->nb_slice_ctx;
if (!(avctx->flags2 & AV_CODEC_FLAG2_CHUNKS)) {
h->current_slice = 0;
if (!h->first_field)
@@ -935,7 +934,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
nal->type, nal->size_bits);
}
- if (context_count == h->max_contexts) {
+ if (context_count == h->nb_slice_ctx) {
ret = ff_h264_execute_decode_slices(h, context_count);
if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
goto end;