aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-19 19:11:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-19 21:46:11 +0100
commitafc03268b4525d0f53ca34b6b3874a40b5f75071 (patch)
tree10f433f0aba6486237da72aa0cfc2d3a5b80176d
parent971c469a0d014121718ccfe1208da045fd098ab0 (diff)
downloadffmpeg-afc03268b4525d0f53ca34b6b3874a40b5f75071.tar.gz
h264: move list_count and current_slice reset to flush_change()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 367f9f611f..7303418f3e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2119,6 +2119,8 @@ static void flush_change(H264Context *h)
ff_h264_reset_sei(h);
h->recovery_frame= -1;
h->sync= 0;
+ h->list_count = 0;
+ h->current_slice = 0;
}
/* forget old pics after a seek */
@@ -2633,8 +2635,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
free_tables(h, 0);
flush_dpb(s->avctx);
ff_MPV_common_end(s);
- h->list_count = 0;
- h->current_slice = 0;
}
if (!s->context_initialized) {
if (h != h0) {