diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 13:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 15:20:29 +0200 |
| commit | fe2df122b4c3441d4213a287c4d8f312a6e5a04a (patch) | |
| tree | af79c61861453bc2fa3e00e81792e904f61cca36 | |
| parent | f96fdb46b773eadcfa5de34e800ec456c0e545b9 (diff) | |
| download | ffmpeg-fe2df122b4c3441d4213a287c4d8f312a6e5a04a.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 0dd71dd878..d7b146e5f2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1734,7 +1734,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); |