diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 13:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-25 15:06:54 +0200 |
| commit | 4191e01e9906a88f4686ee2e20928538da3d4b96 (patch) | |
| tree | aa7307f0399cf85640d447e7cba7393d9bb39849 | |
| parent | e617d6f98844082404a031859b4faf05c3a91bab (diff) | |
| download | ffmpeg-4191e01e9906a88f4686ee2e20928538da3d4b96.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)
| -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 704c0898fb..28217475dc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1728,7 +1728,7 @@ again: if (err < 0 || err == SLICE_SKIPED) { 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 == SLICE_SINGLETHREAD) { if (context_count > 1) { ret = ff_h264_execute_decode_slices(h, context_count - 1); |