aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-26 01:22:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-26 01:22:38 +0200
commit3c9dd93faa9f3c250428dd0548c075583aa07cc3 (patch)
treeb331ee28b6d89f38bed19ebe75a25c74220a6d50
parent2cf94485de9aa0e8f4552fd9477e0d4bc5cb84bc (diff)
downloadffmpeg-3c9dd93faa9f3c250428dd0548c075583aa07cc3.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>
-rw-r--r--libavcodec/h264.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 66720571ab..1be723a6d0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2772,6 +2772,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 */