diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 13:37:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 13:38:37 +0100 |
| commit | f137d5763dbaf352bef6453ac0dcc16c1248137c (patch) | |
| tree | 5b214bb56fb5b39d73699b4a5434d3579dddee41 /libavcodec/zmbv.c | |
| parent | 6fc064893270be7549eccc78fd085ca8521ad9f2 (diff) | |
| parent | d11cb13b0ef02fb1c303b29805819f6e1c9dc61b (diff) | |
| download | ffmpeg-f137d5763dbaf352bef6453ac0dcc16c1248137c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: enable pic for shared libs on AArch64
zmbv: Reset the decoder on keyframe errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/zmbv.c')
| -rw-r--r-- | libavcodec/zmbv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index a2d804a90c..03821cde9e 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -429,6 +429,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac c->fmt = buf[3]; c->bw = buf[4]; c->bh = buf[5]; + c->decode_intra = NULL; + c->decode_xor = NULL; buf += 6; len -= 6; |