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:42:40 +0200 |
| commit | 720e2d4143b52aed731b8d8cd1350bf57d9bfcf3 (patch) | |
| tree | 1608e3a6a2db1a9578571931742cecf7ebb390c3 /libavcodec | |
| parent | 9195ef6f65cbd4d12e7bc3e7d8915595b8b0812b (diff) | |
| download | ffmpeg-720e2d4143b52aed731b8d8cd1350bf57d9bfcf3.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)
Diffstat (limited to 'libavcodec')
| -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 4f5ca99e9a..f7de642e2d 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 */ |