aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-07-19 22:31:57 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-07-20 00:02:12 +0200
commitfd1588919d2c70288a1a3fea1aefdd3ea2c424bb (patch)
tree578bc078176e1972d53ba4dd4302c2ee7ffa44c0 /libavcodec/h264.c
parent68f991d9090dee0960cc6cdf7dca83c7fbe865fa (diff)
downloadffmpeg-fd1588919d2c70288a1a3fea1aefdd3ea2c424bb.tar.gz
avcodec/h264: remove list_count and ref_count clearing
The code conflicts with moving the h264_init_ps() call point Without this, ff_h264_parse_ref_count() fills ref and list count and h264_init_ps() subsequently wipes them out on a "success" path. Subsequently things crash as the wiped fields are used. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f79735bc18..db68c05722 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -776,8 +776,6 @@ void ff_h264_flush_change(H264Context *h)
h->frame_recovered = 0;
h->current_slice = 0;
h->mmco_reset = 1;
- for (i = 0; i < h->nb_slice_ctx; i++)
- h->slice_ctx[i].list_count = 0;
}
/* forget old pics after a seek */