*/
/**
- * @file libavcodec/4xm.c
+ * @file
* 4XM codec.
*/
int mv[256];
VLC pre_vlc;
int last_dc;
- DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
+ DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
void *bitstream_buffer;
unsigned int bitstream_buffer_size;
int version;
av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n");
return;
}
- mcdc(dst, src, log2w, h, stride, 1, le2me_16(*f->wordstream++));
+ mcdc(dst, src, log2w, h, stride, 1, av_le2ne16(*f->wordstream++));
}else if(code == 5){
- mcdc(dst, src, log2w, h, stride, 0, le2me_16(*f->wordstream++));
+ mcdc(dst, src, log2w, h, stride, 0, av_le2ne16(*f->wordstream++));
}else if(code == 6){
if(log2w){
- dst[0] = le2me_16(*f->wordstream++);
- dst[1] = le2me_16(*f->wordstream++);
+ dst[0] = av_le2ne16(*f->wordstream++);
+ dst[1] = av_le2ne16(*f->wordstream++);
}else{
- dst[0 ] = le2me_16(*f->wordstream++);
- dst[stride] = le2me_16(*f->wordstream++);
+ dst[0 ] = av_le2ne16(*f->wordstream++);
+ dst[stride] = av_le2ne16(*f->wordstream++);
}
}
}
init_vlcs(f);
if(f->version>2) avctx->pix_fmt= PIX_FMT_RGB565;
- else avctx->pix_fmt= PIX_FMT_RGB555;
+ else avctx->pix_fmt= PIX_FMT_BGR555;
return 0;
}
f->cfrm[i].allocated_size= 0;
}
free_vlc(&f->pre_vlc);
+ if(f->current_picture.data[0])
+ avctx->release_buffer(avctx, &f->current_picture);
+ if(f->last_picture.data[0])
+ avctx->release_buffer(avctx, &f->last_picture);
return 0;
}
AVCodec fourxm_decoder = {
"4xm",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_4XM,
sizeof(FourXContext),
decode_init,