diff options
author | Paul B Mahol <onemda@gmail.com> | 2016-06-01 15:10:42 -0400 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-06-06 12:05:02 -0400 |
commit | 2a48a75a6f508121b96b0732a9fe03a46303f579 (patch) | |
tree | 9d4c78f802ea0da3f86a4e2e88d75a771b43c7a5 /libavcodec | |
parent | 6e2ad28cf76461b02d85ad178087ba0c628b8d9d (diff) | |
download | ffmpeg-2a48a75a6f508121b96b0732a9fe03a46303f579.tar.gz |
sgirledec: simplify, no need to use reget buffer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/sgirledec.c | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/libavcodec/sgirledec.c b/libavcodec/sgirledec.c index 67d79c81e8..f636bbc308 100644 --- a/libavcodec/sgirledec.c +++ b/libavcodec/sgirledec.c @@ -31,17 +31,9 @@ #include "avcodec.h" #include "internal.h" -typedef struct SGIRLEContext { - AVFrame *frame; -} SGIRLEContext; - static av_cold int sgirle_decode_init(AVCodecContext *avctx) { - SGIRLEContext *s = avctx->priv_data; avctx->pix_fmt = AV_PIX_FMT_BGR8; - s->frame = av_frame_alloc(); - if (!s->frame) - return AVERROR(ENOMEM); return 0; } @@ -120,41 +112,31 @@ static int decode_sgirle8(AVCodecContext *avctx, uint8_t *dst, static int sgirle_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - SGIRLEContext *s = avctx->priv_data; + AVFrame *frame = data; int ret; - if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - ret = decode_sgirle8(avctx, s->frame->data[0], avpkt->data, avpkt->size, - avctx->width, avctx->height, s->frame->linesize[0]); + ret = decode_sgirle8(avctx, frame->data[0], avpkt->data, avpkt->size, + avctx->width, avctx->height, frame->linesize[0]); if (ret < 0) return ret; + frame->pict_type = AV_PICTURE_TYPE_I; + frame->key_frame = 1; + *got_frame = 1; - if ((ret = av_frame_ref(data, s->frame)) < 0) - return ret; return avpkt->size; } -static av_cold int sgirle_decode_end(AVCodecContext *avctx) -{ - SGIRLEContext *s = avctx->priv_data; - - av_frame_free(&s->frame); - - return 0; -} - AVCodec ff_sgirle_decoder = { .name = "sgirle", .long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics RLE 8-bit video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SGIRLE, - .priv_data_size = sizeof(SGIRLEContext), .init = sgirle_decode_init, - .close = sgirle_decode_end, .decode = sgirle_decode_frame, .capabilities = AV_CODEC_CAP_DR1, }; |