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

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


ffmpeg | branch: release/2.0 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 26 01:22:38 2013 +0200| [1d0e58372885aa29a3c0f856bec522bd41b0307e] | 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=1d0e58372885aa29a3c0f856bec522bd41b0307e
---

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8c64d26..21c827a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2660,6 +2660,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