From afc03268b4525d0f53ca34b6b3874a40b5f75071 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 19 Dec 2012 19:11:06 +0100
Subject: [PATCH] h264: move list_count and current_slice reset to
flush_change()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/h264.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 367f9f611f5..7303418f3e0 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) {
--
GitLab