summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-20 14:55:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-20 15:37:23 +0200
commit8456089f5066104eb392be04ef7a1f532e182c28 (patch)
treea3283b4c66090ddc8a70730d10c2909101dd25d2
parentc7a435aab2637b9f48930f998b7f9f3d776a44ac (diff)
ffv1: clear slice state in decode_slice()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/ffv1.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index df3949cd14..7d985f0a37 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1508,6 +1508,9 @@ static int decode_slice(AVCodecContext *c, void *arg){
const int ps= (c->bits_per_raw_sample>8)+1;
AVFrame * const p= &f->picture;
+ if(f->picture.key_frame)
+ clear_slice_state(f, fs);
+
av_assert1(width && height);
if(f->colorspace==0){
const int chroma_width = -((-width )>>f->chroma_h_shift);
@@ -1839,8 +1842,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
return -1;
if(init_slices_state(f) < 0)
return -1;
-
- clear_state(f);
}else{
p->key_frame= 0;
}