diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 13:38:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-16 16:03:24 +0200 |
commit | 2b69da7b5ac3b6f96847f350f3f03c30b82832e9 (patch) | |
tree | 742f3b64c76d0fed226a81715c4c7175494f0c7f | |
parent | 0df90898f5a3cbbb8c664a05d69c29655ccf0a80 (diff) | |
download | ffmpeg-2b69da7b5ac3b6f96847f350f3f03c30b82832e9.tar.gz |
avcodec/h264: reset the counts in the correct context
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8f8d632220100bfde26587b27da73901b05cb774)
Conflicts:
libavcodec/h264.c
-rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f17304eaeb..92c9fbc9e6 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5223,7 +5223,7 @@ again: if (err < 0) { av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n"); - h->ref_count[0] = h->ref_count[1] = h->list_count = 0; + hx->ref_count[0] = hx->ref_count[1] = hx->list_count = 0; } else if (err == 1) { if (context_count > 1) { ret = execute_decode_slices(h, context_count - 1); |