diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-26 01:22:38 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-26 02:41:31 +0200 |
| commit | 1d0e58372885aa29a3c0f856bec522bd41b0307e (patch) | |
| tree | cd58412b9bce7f3195ca42ba9eb1b02891e43cdc | |
| parent | 782331be1eb23717a2c7633f8e364f0e833275e4 (diff) | |
| download | ffmpeg-1d0e58372885aa29a3c0f856bec522bd41b0307e.tar.gz | |
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@gmx.at>
(cherry picked from commit 3c9dd93faa9f3c250428dd0548c075583aa07cc3)
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8c64d260d5..21c827a406 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 */ |