aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-10 02:25:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-10 02:25:51 +0200
commit65c2fe7159f7521bf694b3990a148c71166e38ac (patch)
tree5120f058d40515dccd5ba726cd381b18de6fc6aa
parent5ac6b6028f17b64723884c9fa72cfcbd369a1ba2 (diff)
downloadffmpeg-65c2fe7159f7521bf694b3990a148c71166e38ac.tar.gz
avcodec/h264: call flush_change() on init
This ensures that all the non zero fields get setup correctly. Alternatively their initialization could be duplicated. Fixes Ticket2738 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 93d4517512..ccad9b9ff3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -50,6 +50,8 @@
#include <assert.h>
+static void flush_change(H264Context *h);
+
const uint16_t ff_h264_mb_sizes[4] = { 256, 384, 512, 768 };
static const uint8_t rem6[QP_MAX_NUM + 1] = {
@@ -1633,6 +1635,8 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
avctx->internal->allocate_progress = 1;
+ flush_change(h);
+
return 0;
}