[FFmpeg-cvslog] h264: move list_count and current_slice reset to flush_change()

Michael Niedermayer git at videolan.org
Wed Dec 19 21:52:18 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 19:11:06 2012 +0100| [afc03268b4525d0f53ca34b6b3874a40b5f75071] | committer: Michael Niedermayer

h264: move list_count and current_slice reset to flush_change()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afc03268b4525d0f53ca34b6b3874a40b5f75071
---

 libavcodec/h264.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 367f9f6..7303418 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) {



More information about the ffmpeg-cvslog mailing list