diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-08 13:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 22:01:46 +0200 |
| commit | 8be177e048cef56d9d5ad267afa183489a721b00 (patch) | |
| tree | 41da01e7c9f3eb4331b612c890333aa2a3f05c3f | |
| parent | 7d5908d5c834df88e5f857a58db55305ab564d01 (diff) | |
| download | ffmpeg-8be177e048cef56d9d5ad267afa183489a721b00.tar.gz | |
avcodec/h264: reset the counts in the correct context
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 6fa0b7b8c6..f2b5a361bc 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1678,7 +1678,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); |