typedef struct CRIContext {
AVCodecContext *jpeg_avctx; // wrapper context for MJPEG
+ AVPacket *jpkt; // encoded JPEG tile
AVFrame *jpgframe; // decoded JPEG tile
GetByteContext gb;
if (!s->jpgframe)
return AVERROR(ENOMEM);
+ s->jpkt = av_packet_alloc();
+ if (!s->jpkt)
+ return AVERROR(ENOMEM);
+
codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG);
if (!codec)
return AVERROR_BUG;
unsigned offset = 0;
for (int tile = 0; tile < 4; tile++) {
- AVPacket jpkt;
-
- av_init_packet(&jpkt);
- jpkt.data = (uint8_t *)s->data + offset;
- jpkt.size = s->tile_size[tile];
+ av_packet_unref(s->jpkt);
+ s->jpkt->data = (uint8_t *)s->data + offset;
+ s->jpkt->size = s->tile_size[tile];
- ret = avcodec_send_packet(s->jpeg_avctx, &jpkt);
+ ret = avcodec_send_packet(s->jpeg_avctx, s->jpkt);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error submitting a packet for decoding\n");
return ret;
CRIContext *s = avctx->priv_data;
av_frame_free(&s->jpgframe);
+ av_packet_free(&s->jpkt);
avcodec_free_context(&s->jpeg_avctx);
return 0;
}
-AVCodec ff_cri_decoder = {
+const AVCodec ff_cri_decoder = {
.name = "cri",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_CRI,