diff options
Diffstat (limited to 'libavcodec/sgidec.c')
-rw-r--r-- | libavcodec/sgidec.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index 51bd5d6..4b98daf 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -27,7 +27,6 @@ #include "sgi.h" typedef struct SgiState { - AVFrame picture; unsigned int width; unsigned int height; unsigned int depth; @@ -156,8 +155,7 @@ static int decode_frame(AVCodecContext *avctx, AVPacket *avpkt) { SgiState *s = avctx->priv_data; - AVFrame *picture = data; - AVFrame *p = &s->picture; + AVFrame *p = data; unsigned int dimension, rle; int ret = 0; uint8_t *out_buf, *out_end; @@ -207,11 +205,7 @@ static int decode_frame(AVCodecContext *avctx, return -1; avcodec_set_dimensions(avctx, s->width, s->height); - if (p->data[0]) - avctx->release_buffer(avctx, p); - - p->reference = 0; - if (ff_get_buffer(avctx, p) < 0) { + if (ff_get_buffer(avctx, p, 0) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed.\n"); return -1; } @@ -233,7 +227,6 @@ static int decode_frame(AVCodecContext *avctx, } if (ret == 0) { - *picture = s->picture; *got_frame = 1; return avpkt->size; } else { @@ -241,32 +234,11 @@ static int decode_frame(AVCodecContext *avctx, } } -static av_cold int sgi_init(AVCodecContext *avctx){ - SgiState *s = avctx->priv_data; - - avcodec_get_frame_defaults(&s->picture); - avctx->coded_frame = &s->picture; - - return 0; -} - -static av_cold int sgi_end(AVCodecContext *avctx) -{ - SgiState * const s = avctx->priv_data; - - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - - return 0; -} - AVCodec ff_sgi_decoder = { .name = "sgi", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_SGI, .priv_data_size = sizeof(SgiState), - .init = sgi_init, - .close = sgi_end, .decode = decode_frame, .long_name = NULL_IF_CONFIG_SMALL("SGI image"), .capabilities = CODEC_CAP_DR1, |