*/
/**
- * @file libavcodec/eacmv.c
+ * @file
* Electronic Arts CMV Video Decoder
- * by Peter Ross (suxen_drol at hotmail dot com)
+ * by Peter Ross (pross@xvid.org)
*
* Technical details here:
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV
*/
#include "libavutil/intreadwrite.h"
+#include "libavcore/imgutils.h"
#include "avcodec.h"
typedef struct CmvContext {
}else if(raw<buf_end) { /* inter using second-last frame as reference */
int xoffset = (*raw & 0xF) - 7;
int yoffset = ((*raw >> 4)) - 7;
- cmv_motcomp(s->frame.data[0], s->frame.linesize[0],
- s->last2_frame.data[0], s->last2_frame.linesize[0],
- x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
+ if (s->last2_frame.data[0])
+ cmv_motcomp(s->frame.data[0], s->frame.linesize[0],
+ s->last2_frame.data[0], s->last2_frame.linesize[0],
+ x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);
raw++;
}
}else{ /* inter using last frame as reference */
static int cmv_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
CmvContext *s = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
return buf_size;
}
- if (avcodec_check_dimensions(s->avctx, s->width, s->height))
+ if (av_image_check_size(s->width, s->height, 0, s->avctx))
return -1;
/* shuffle */
return 0;
}
-AVCodec eacmv_decoder = {
+AVCodec ff_eacmv_decoder = {
"eacmv",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_CMV,
sizeof(CmvContext),
cmv_decode_init,
cmv_decode_end,
cmv_decode_frame,
CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV Video"),
+ .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts CMV video"),
};