diff options
| author | James Almer <jamrial@gmail.com> | 2021-01-28 22:45:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-03-17 14:12:18 -0300 |
| commit | 1f32e91df62209d5fdaeb6f0f087a7d9ba857358 (patch) | |
| tree | 5f1f7c70526fe6ad61feca9c247b26633b577ee9 | |
| parent | d422b2ed87ee7d3b3014cd3fac553e6aad7d4f14 (diff) | |
| download | ffmpeg-1f32e91df62209d5fdaeb6f0f087a7d9ba857358.tar.gz | |
avcodec/cri: use av_packet_alloc() to allocate packets
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/cri.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/cri.c b/libavcodec/cri.c index 3312606b75..0558d0c8dd 100644 --- a/libavcodec/cri.c +++ b/libavcodec/cri.c @@ -37,6 +37,7 @@ typedef struct CRIContext { AVCodecContext *jpeg_avctx; // wrapper context for MJPEG + AVPacket *jpkt; // encoded JPEG tile AVFrame *jpgframe; // decoded JPEG tile GetByteContext gb; @@ -56,6 +57,10 @@ static av_cold int cri_decode_init(AVCodecContext *avctx) 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; @@ -345,13 +350,11 @@ skip: 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; @@ -415,6 +418,7 @@ static av_cold int cri_decode_close(AVCodecContext *avctx) CRIContext *s = avctx->priv_data; av_frame_free(&s->jpgframe); + av_packet_free(&s->jpkt); avcodec_free_context(&s->jpeg_avctx); return 0; |