*/
/**
- * @file cljr.c
+ * @file
* Cirrus Logic AccuPak codec.
*/
#include "avcodec.h"
#include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
/* Disable the encoder. */
#undef CONFIG_CLJR_ENCODER
+#define CONFIG_CLJR_ENCODER 0
typedef struct CLJRContext{
AVCodecContext *avctx;
static int 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;
CLJRContext * const a = avctx->priv_data;
AVFrame *picture = data;
AVFrame * const p= (AVFrame*)&a->picture;
return buf_size;
}
-#ifdef CONFIG_CLJR_ENCODER
+#if CONFIG_CLJR_ENCODER
static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
CLJRContext * const a = avctx->priv_data;
AVFrame *pict = data;
AVFrame * const p= (AVFrame*)&a->picture;
int size;
- int mb_x, mb_y;
*p = *pict;
p->pict_type= FF_I_TYPE;
return 0;
}
-#ifdef CONFIG_CLJR_ENCODER
+#if CONFIG_CLJR_ENCODER
static av_cold int encode_init(AVCodecContext *avctx){
common_init(avctx);
AVCodec cljr_decoder = {
"cljr",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_CLJR,
sizeof(CLJRContext),
decode_init,
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
};
-#ifdef CONFIG_CLJR_ENCODER
+#if CONFIG_CLJR_ENCODER
AVCodec cljr_encoder = {
"cljr",
- CODEC_TYPE_VIDEO,
- CODEC_ID_cljr,
+ AVMEDIA_TYPE_VIDEO,
+ CODEC_ID_CLJR,
sizeof(CLJRContext),
encode_init,
encode_frame,