[FFmpeg-cvslog] h264: make flush_change() set mmco_reset

Michael Niedermayer git at videolan.org
Sat Oct 26 02:46:39 CEST 2013


ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 26 01:22:38 2013 +0200| [720e2d4143b52aed731b8d8cd1350bf57d9bfcf3] | committer: Carl Eugen Hoyos

h264: make flush_change() set mmco_reset

This ensures that frames do not get mixed on context reinits

Fixes Ticket2836

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 3c9dd93faa9f3c250428dd0548c075583aa07cc3)

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

 libavcodec/h264.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 4f5ca99..f7de642 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2584,6 +2584,7 @@ static void flush_change(H264Context *h)
     h->sync= 0;
     h->list_count = 0;
     h->current_slice = 0;
+    h->mmco_reset = 1;
 }
 
 /* forget old pics after a seek */



More information about the ffmpeg-cvslog mailing list