From 4310ba273d3bcb7f19a4e40b55b9e832568e56e5 Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Mon, 2 Jun 2014 17:42:17 -0400 Subject: [PATCH] sgidec: fix an incorrect backport Bug-Id: 691 Signed-off-by: Anton Khirnov --- libavcodec/sgidec.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c index 94de9fdcd1..4799e831e3 100644 --- a/libavcodec/sgidec.c +++ b/libavcodec/sgidec.c @@ -247,6 +247,8 @@ static int decode_frame(AVCodecContext *avctx, static av_cold int sgi_init(AVCodecContext *avctx){ SgiState *s = avctx->priv_data; + s->avctx = avctx; + avcodec_get_frame_defaults(&s->picture); avctx->coded_frame = &s->picture; @@ -263,15 +265,6 @@ static av_cold int sgi_end(AVCodecContext *avctx) return 0; } -static av_cold int sgi_decode_init(AVCodecContext *avctx) -{ - SgiState *s = avctx->priv_data; - - s->avctx = avctx; - - return 0; -} - AVCodec ff_sgi_decoder = { .name = "sgi", .type = AVMEDIA_TYPE_VIDEO, @@ -280,7 +273,6 @@ AVCodec ff_sgi_decoder = { .init = sgi_init, .close = sgi_end, .decode = decode_frame, - .init = sgi_decode_init, .long_name = NULL_IF_CONFIG_SMALL("SGI image"), .capabilities = CODEC_CAP_DR1, };