diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 15:16:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 15:30:34 +0200 |
| commit | 820109224142323f182c2917e3d8ddc34324b5df (patch) | |
| tree | 1ba14a4d75050d7d5e9a48146bc2b9e4d3cc2234 /libavcodec/h264.c | |
| parent | 9f39d3d1908dfb7764120a90cbf524e04e9ed199 (diff) | |
| download | ffmpeg-820109224142323f182c2917e3d8ddc34324b5df.tar.gz | |
h264: reset current_slice on context reinit
This fixes a null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2903cf9a6d..117cd7e630 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2975,6 +2975,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) flush_dpb(s->avctx); ff_MPV_common_end(s); h->list_count = 0; + h->current_slice = 0; } if (!s->context_initialized) { if (h != h0) { |