*/
/**
- * @file libavcodec/zmbv.c
+ * @file
* Zip Motion Blocks Video decoder
*/
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
ZmbvContext * const c = avctx->priv_data;
- uint8_t *outptr;
int zret = Z_OK; // Zlib return code
int len = buf_size;
int hi_ver, lo_ver;
return -1;
}
- outptr = c->pic.data[0]; // Output image pointer
-
/* parse header */
c->flags = buf[0];
buf++; len--;
}
if(c->bw == 0 || c->bh == 0) {
av_log(avctx, AV_LOG_ERROR, "Unsupported block size %ix%i\n", c->bw, c->bh);
+ return -1;
}
if(c->comp != 0 && c->comp != 1) {
av_log(avctx, AV_LOG_ERROR, "Unsupported compression type %i\n", c->comp);
}
if(c->flags & ZMBV_KEYFRAME) {
c->pic.key_frame = 1;
- c->pic.pict_type = FF_I_TYPE;
+ c->pic.pict_type = AV_PICTURE_TYPE_I;
c->decode_intra(c);
} else {
c->pic.key_frame = 0;
- c->pic.pict_type = FF_P_TYPE;
+ c->pic.pict_type = AV_PICTURE_TYPE_P;
if(c->decomp_len)
c->decode_xor(c);
}
c->width = avctx->width;
c->height = avctx->height;
+ avcodec_get_frame_defaults(&c->pic);
- if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
- return 1;
- }
c->bpp = avctx->bits_per_coded_sample;
// Needed if zlib unused or init aborted before inflateInit
return 0;
}
-AVCodec zmbv_decoder = {
+AVCodec ff_zmbv_decoder = {
"zmbv",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_ZMBV,
sizeof(ZmbvContext),
decode_init,