|
|
@ -688,7 +688,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static void common_end(FFV1Context *s){ |
|
|
|
static int common_end(AVCodecContext *avctx){ |
|
|
|
|
|
|
|
FFV1Context *s = avctx->priv_data; |
|
|
|
int i; |
|
|
|
int i; |
|
|
|
|
|
|
|
|
|
|
|
for(i=0; i<s->plane_count; i++){ |
|
|
|
for(i=0; i<s->plane_count; i++){ |
|
|
@ -696,13 +697,6 @@ static void common_end(FFV1Context *s){ |
|
|
|
|
|
|
|
|
|
|
|
av_freep(&p->state); |
|
|
|
av_freep(&p->state); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int encode_end(AVCodecContext *avctx) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
FFV1Context *s = avctx->priv_data; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
common_end(s); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return 0; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
@ -1018,7 +1012,7 @@ AVCodec ffv1_decoder = { |
|
|
|
sizeof(FFV1Context), |
|
|
|
sizeof(FFV1Context), |
|
|
|
decode_init, |
|
|
|
decode_init, |
|
|
|
NULL, |
|
|
|
NULL, |
|
|
|
NULL, |
|
|
|
common_end, |
|
|
|
decode_frame, |
|
|
|
decode_frame, |
|
|
|
CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, |
|
|
|
CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, |
|
|
|
NULL |
|
|
|
NULL |
|
|
@ -1032,6 +1026,6 @@ AVCodec ffv1_encoder = { |
|
|
|
sizeof(FFV1Context), |
|
|
|
sizeof(FFV1Context), |
|
|
|
encode_init, |
|
|
|
encode_init, |
|
|
|
encode_frame, |
|
|
|
encode_frame, |
|
|
|
encode_end, |
|
|
|
common_end, |
|
|
|
}; |
|
|
|
}; |
|
|
|
#endif |
|
|
|
#endif |
|
|
|