c->curfrm++;
if(c->curfrm == c->keyint)
c->curfrm = 0;
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
avctx->coded_frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
avctx->coded_frame->key_frame = keyframe;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
chpal = !keyframe && memcmp(p->data[1], c->pal2, 1024);
palptr = (uint32_t*)p->data[1];
deflateEnd(&c->zstream);
av_freep(&c->prev);
- av_frame_free(&avctx->coded_frame);
-
return 0;
}
memset(&c->zstream, 0, sizeof(z_stream));
c->comp_size = avctx->width * avctx->height + 1024 +
((avctx->width + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * ((avctx->height + ZMBV_BLOCK - 1) / ZMBV_BLOCK) * 2 + 4;
- if ((c->work_buf = av_malloc(c->comp_size)) == NULL) {
+ if (!(c->work_buf = av_malloc(c->comp_size))) {
av_log(avctx, AV_LOG_ERROR, "Can't allocate work buffer.\n");
return AVERROR(ENOMEM);
}
((c->comp_size + 63) >> 6) + 11;
/* Allocate compression buffer */
- if ((c->comp_buf = av_malloc(c->comp_size)) == NULL) {
+ if (!(c->comp_buf = av_malloc(c->comp_size))) {
av_log(avctx, AV_LOG_ERROR, "Can't allocate compression buffer.\n");
return AVERROR(ENOMEM);
}
c->pstride = FFALIGN(avctx->width, 16);
- if ((c->prev = av_malloc(c->pstride * avctx->height)) == NULL) {
+ if (!(c->prev = av_malloc(c->pstride * avctx->height))) {
av_log(avctx, AV_LOG_ERROR, "Can't allocate picture.\n");
return AVERROR(ENOMEM);
}
return -1;
}
- avctx->coded_frame = av_frame_alloc();
- if (!avctx->coded_frame) {
- encode_end(avctx);
- return AVERROR(ENOMEM);
- }
-
return 0;
}